merge with vespa version
authorThadeu Lima de Souza Cascardo <cascardo@mail.holoscopio.com>
Tue, 9 Oct 2007 03:40:07 +0000 (00:40 -0300)
committerThadeu Lima de Souza Cascardo <cascardo@mail.holoscopio.com>
Tue, 9 Oct 2007 03:40:07 +0000 (00:40 -0300)

Trivial merge