merge of '6e74b2fee10237a84d8fbb1c808ab89f75d0acc7'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 21 Oct 2006 11:16:41 +0000 (11:16 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 21 Oct 2006 11:16:41 +0000 (11:16 +0000)
     and 'fd0aec6ea64556790357667659c40906bcc453cd'


Trivial merge