merge of 'a9d59f7c5db704e36d7f7dbda87b750cabbbc775'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Fri, 22 Jun 2007 17:57:39 +0000 (17:57 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Fri, 22 Jun 2007 17:57:39 +0000 (17:57 +0000)
     and 'fcf3721db5cf2d3c669e8d3d36cd3ca4df792f6f'


Trivial merge