merge of '411e1889fa68a7d9f1fbfbfd00522a1e50051dcb'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 20 Mar 2008 16:23:30 +0000 (16:23 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 20 Mar 2008 16:23:30 +0000 (16:23 +0000)
     and 'c1f2a1f7dbe3e69fcd7448c9758a3a79555c74b9'


Trivial merge