merge of '555ca250058a761fb7d692d41e9748b7168b2e6d'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 23 Aug 2007 13:44:55 +0000 (13:44 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 23 Aug 2007 13:44:55 +0000 (13:44 +0000)
     and '57097c5f7112c41b7466c7f14c1b99593a6d65ae'


Trivial merge