merge of '34b95284d8caffb64aa40f9e36e92e2c5950ba26'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 8 Feb 2007 11:44:06 +0000 (11:44 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 8 Feb 2007 11:44:06 +0000 (11:44 +0000)
     and 'e29bb666531e645143bf0e0a07e299be93d1ce1a'


Trivial merge