merge of '8feaf9690f0a2100128b1830f061fb71951fd3f4'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 23 Aug 2007 08:33:46 +0000 (08:33 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 23 Aug 2007 08:33:46 +0000 (08:33 +0000)
     and 'aa7e855436eea5f20330a56ce6657b0a9ebc844c'


Trivial merge