merge of '60886f11068b84382ae4769a9fb5f1b85f9a6aa5'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 23 Aug 2007 12:10:56 +0000 (12:10 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 23 Aug 2007 12:10:56 +0000 (12:10 +0000)
     and 'ddf650a0cb7bb395770eac25e38c0ba82c1ec204'


Trivial merge