Merge branch 'nogobject-lr1'
authorThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Wed, 27 Aug 2008 17:18:50 +0000 (14:18 -0300)
committerThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Wed, 27 Aug 2008 17:18:50 +0000 (14:18 -0300)

Trivial merge