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)
commitb27b36c41fb203aff008cd35a37bb3f4ef1a0ed2
tree4c874aef6e084a8bf579b05de86443ff7d7c1944
parent9f8c8ce6db7bb1ae55636b85cef0698656b5aa9c
parent94f17152702e554ed343d673cf75de800860361a
Merge ... '34b95284d8caffb64aa40f9e36e92e2c5950ba26'
     and 'e29bb666531e645143bf0e0a07e299be93d1ce1a'