Merge commit 'gzv/master'
authorThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Sat, 16 Aug 2008 20:18:58 +0000 (17:18 -0300)
committerThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Sat, 16 Aug 2008 20:18:58 +0000 (17:18 -0300)

Trivial merge