Merge fixes branch.
authorOtavio Salvador <otavio@ossystems.com.br>
Sat, 14 Jul 2007 16:02:52 +0000 (13:02 -0300)
committerOtavio Salvador <otavio@ossystems.com.br>
Sat, 14 Jul 2007 16:02:52 +0000 (13:02 -0300)

Trivial merge