merge of '5c6b28eb0fad207cf17fb5e7fb8be52199036f6f'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Tue, 13 Feb 2007 13:07:13 +0000 (13:07 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Tue, 13 Feb 2007 13:07:13 +0000 (13:07 +0000)
     and 'd3e5f4ada0b246ab8888070c4b4978c4b9e50f57'


Trivial merge