merge of '1e8faa4701311b4c11fce9ad2aaef0fd6ae13561'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 29 Mar 2007 09:03:44 +0000 (09:03 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 29 Mar 2007 09:03:44 +0000 (09:03 +0000)
     and 'ec509c3d471398d22393a140ab3979247c0a566c'


Trivial merge