merge of 'bbeaeb4852713f1f3f0b153a3d6756319df80110'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 11 Mar 2007 14:17:00 +0000 (14:17 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 11 Mar 2007 14:17:00 +0000 (14:17 +0000)
     and 'ccbbf95d21d99ceeb1ff4499e3e502f86ff66645'


Trivial merge