merge of 07ec1a0bb5473984aad7086c0164371a99b62f47
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 26 Jul 2006 12:12:46 +0000 (12:12 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 26 Jul 2006 12:12:46 +0000 (12:12 +0000)
     and ea7b7ac1f0c9187b9523a2144f045196873dc260


Trivial merge