merge of '2994aa36c2fc770f17f1156ec1d07bb4890f2c1c'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 31 Aug 2006 21:23:31 +0000 (21:23 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 31 Aug 2006 21:23:31 +0000 (21:23 +0000)
     and '73e50ed2ac3eec8ff383c4b49eb7dac23c9663bf'


Trivial merge