merge of '688b2cdecdf3a0e190f7bd6e3a1bef263058f757'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 17 Jun 2007 11:11:14 +0000 (11:11 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 17 Jun 2007 11:11:14 +0000 (11:11 +0000)
     and '815032281c4fa6bc06533e41b2b364caf104969f'


Trivial merge