merge of '1d92faee8c678bb302af53ec17472ea90c3c6e46'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Mon, 28 Aug 2006 16:04:06 +0000 (16:04 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Mon, 28 Aug 2006 16:04:06 +0000 (16:04 +0000)
     and 'b27820d75a034508419598a68bcbe1342bcf2ee1'


Trivial merge