merge of 4986fed9f3de1a9c41e2d80bbe84ae27b1fc14fa
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 23 Jul 2006 14:23:47 +0000 (14:23 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 23 Jul 2006 14:23:47 +0000 (14:23 +0000)
     and 6e33e6f5b302b27119a3f49eb2dae64ee0db7ec5


Trivial merge