merge of '60886f11068b84382ae4769a9fb5f1b85f9a6aa5'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 23 Aug 2007 12:10:56 +0000 (12:10 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 23 Aug 2007 12:10:56 +0000 (12:10 +0000)
commit3e776408674d2fe1ed4ee93ec275a826c66a664b
treee9f55c2d4de8cfc40a163ca352330bc4fa8a54fd
parentaa95de37e18da5a4cdd03207fbe29da1650f6c71
parentce541bd7bcdfcda3a57888cc7b8da191a12567ef
Merge ... '60886f11068b84382ae4769a9fb5f1b85f9a6aa5'
     and 'ddf650a0cb7bb395770eac25e38c0ba82c1ec204'