merge of '872617c69808de974c084a129088813f22b4ca0d'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Tue, 29 Aug 2006 10:55:18 +0000 (10:55 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Tue, 29 Aug 2006 10:55:18 +0000 (10:55 +0000)
     and '8f3da738b3287e652cd9b58552555515d18edc2c'


Trivial merge