merge of '733d4e48ce19507bf1589fcce3299461a3ac52cf'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 23 Aug 2007 21:09:51 +0000 (21:09 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 23 Aug 2007 21:09:51 +0000 (21:09 +0000)
     and 'f3f91ac369acb0960f35921cef67518f0d1f446a'


Trivial merge