merge
authorLisandro Dalcin <dalcinl@gmail.com>
Thu, 12 Feb 2009 15:43:33 +0000 (13:43 -0200)
committerLisandro Dalcin <dalcinl@gmail.com>
Thu, 12 Feb 2009 15:43:33 +0000 (13:43 -0200)

Trivial merge