merge of 'a4c123e0e153d70e8abbfebd4ae1f8275c9fb4a1'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 31 Mar 2007 19:09:52 +0000 (19:09 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 31 Mar 2007 19:09:52 +0000 (19:09 +0000)
     and 'cd09ce621aa0ddff8436a7dc27250ade56d36571'


Trivial merge