merge of '6532e26aa38ae6a2b6f815a67a5c317d6fe32c3f'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 7 Feb 2007 15:21:25 +0000 (15:21 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 7 Feb 2007 15:21:25 +0000 (15:21 +0000)
     and '69feaf31348d8a4d64d89a199b72e466ba009c78'


Trivial merge