merge of '786b1075e179d564393fd56094454da0bfcfbf1c'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 17 Jun 2007 10:18:52 +0000 (10:18 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 17 Jun 2007 10:18:52 +0000 (10:18 +0000)
     and 'd4199b222eb8c2755fae3eefe9fdbd225e6d9e81'


Trivial merge