merge of 190f097c5ba012f104c1da5f3f25f62ca0d37160
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 29 Jul 2006 08:38:08 +0000 (08:38 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 29 Jul 2006 08:38:08 +0000 (08:38 +0000)
     and 32f06dadf7c94b815b1d768767d05ac20f94e8a4


Trivial merge