merge of 'a7f77b321a367b9f9968493707b5bbf8b6964b50'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Tue, 29 Aug 2006 09:32:05 +0000 (09:32 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Tue, 29 Aug 2006 09:32:05 +0000 (09:32 +0000)
     and 'e69ec8c22b9de95c8926c3818775337d0ad13c8a'


Trivial merge