merge of '456124b7d55f34d0e4b0703a7026ccde10d0ddab'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Mon, 15 Jan 2007 16:14:04 +0000 (16:14 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Mon, 15 Jan 2007 16:14:04 +0000 (16:14 +0000)
     and 'afecd5c6e854fdb61b8eaceddd3a075399c900b3'


Trivial merge