merge
authorLisandro Dalcin <dalcinl@gmail.com>
Mon, 23 Feb 2009 21:04:54 +0000 (19:04 -0200)
committerLisandro Dalcin <dalcinl@gmail.com>
Mon, 23 Feb 2009 21:04:54 +0000 (19:04 -0200)

Trivial merge