merge of '29f18c2c0029fd3d13de5cd9fcfb660d02e92d7f'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 9 Aug 2006 10:42:31 +0000 (10:42 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 9 Aug 2006 10:42:31 +0000 (10:42 +0000)
commitcb500cd2ee28e59b29d409e79450560ab2ad4270
tree375c6dc04f16bbdd1976f8889d25045ca1e47f89
parent9122d6a39d5de70017c0476eca03adb51e9f876e
parent5b8d59537b5beadb7e25a72172544069d88fa856
Merge ... '29f18c2c0029fd3d13de5cd9fcfb660d02e92d7f'
     and '6172d35f51653bcccfdee6d1406ae52584df35a7'