merge of '30b35d26d67618622ba1fd8fffabd5be4d9508a4'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Mon, 24 Sep 2007 10:50:27 +0000 (10:50 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Mon, 24 Sep 2007 10:50:27 +0000 (10:50 +0000)
     and '51bb8f349026919119902bbef09d2df9b50512fa'


Trivial merge