merge of 206b9c34335d6624ecb83fa31c72e4d6fbe3b541
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 23 Jul 2006 14:19:49 +0000 (14:19 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 23 Jul 2006 14:19:49 +0000 (14:19 +0000)
     and da3bdc9f7b7872511bed7da95bbe562ffd88f6fe


Trivial merge