merge of '45bac0f69c12d8a3598b9178c26d8ed103e60bc7'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Tue, 22 Aug 2006 11:08:33 +0000 (11:08 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Tue, 22 Aug 2006 11:08:33 +0000 (11:08 +0000)
     and 'bb05117c7225627eddadd5005388bf209a7d68d8'


Trivial merge