merge of '487f86d7da4356e5d8c6832b7ff5f0ee9ab8c293'
authorRodrigo Vivi <rodrigo.vivi@gmail.com>
Thu, 27 Mar 2008 18:45:00 +0000 (18:45 +0000)
committerRodrigo Vivi <rodrigo.vivi@gmail.com>
Thu, 27 Mar 2008 18:45:00 +0000 (18:45 +0000)
     and 'd1dfc5df9769c50ec5328454ab737f091f6c573f'


Trivial merge