merge of '09016de82e8089016031f1df831bdc386449eec6'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 21 Oct 2006 11:05:57 +0000 (11:05 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 21 Oct 2006 11:05:57 +0000 (11:05 +0000)
     and '4b0133764e1b19133abfc5dd0dccaadce5f5593a'


Trivial merge