merge of '4ce409402d3a4d6242c33a93272d0721659ad13f'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 2 Sep 2006 12:16:59 +0000 (12:16 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 2 Sep 2006 12:16:59 +0000 (12:16 +0000)
     and 'b390e39e15fdf0dd583d371f2d99f56f01cc9794'


Trivial merge