Merge branch 'master' into holoscopio
authorThadeu Lima de Souza Cascardo <cascardo@vespa.holoscopio.com>
Mon, 8 Oct 2007 14:42:50 +0000 (11:42 -0300)
committerThadeu Lima de Souza Cascardo <cascardo@vespa.holoscopio.com>
Mon, 8 Oct 2007 14:42:50 +0000 (11:42 -0300)

Trivial merge