merge of '77d1168447e90e85323f9ec845e69ae66dfafff0'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 2 Sep 2006 11:26:17 +0000 (11:26 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 2 Sep 2006 11:26:17 +0000 (11:26 +0000)
     and 'ca845f15a06256056c6a92786915915d92d47d70'


Trivial merge