merge of '29f18c2c0029fd3d13de5cd9fcfb660d02e92d7f'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 9 Aug 2006 10:42:31 +0000 (10:42 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 9 Aug 2006 10:42:31 +0000 (10:42 +0000)
     and '6172d35f51653bcccfdee6d1406ae52584df35a7'


Trivial merge