merge of af8709007f32abecb4c0405405d92fb4c571c39f
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 23 Jul 2006 14:29:11 +0000 (14:29 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 23 Jul 2006 14:29:11 +0000 (14:29 +0000)
     and ba784a232849fe4344908f828cb7e341d36fe24c


Trivial merge