merge of '8723751526ceecdd63a4b78f1669ae780793d31c'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Fri, 25 Aug 2006 10:18:43 +0000 (10:18 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Fri, 25 Aug 2006 10:18:43 +0000 (10:18 +0000)
     and '916afd44c39ce855a02330e67657b5b7847da659'


Trivial merge