merge of 'd0ae77e1de9b83964bf64f6d3789f91c235bbddc'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 19 Apr 2007 12:09:24 +0000 (12:09 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 19 Apr 2007 12:09:24 +0000 (12:09 +0000)
     and 'dd76313fd168e9fa91704f396bfd548e0149135a'


Trivial merge