merge of '295aed22d5a8b2aba3ea13993d33fdf1548e9f4a'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 26 Aug 2006 14:40:57 +0000 (14:40 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 26 Aug 2006 14:40:57 +0000 (14:40 +0000)
commitde16ac5ca528bba54214c4e8c145fa5b3bb21ba4
tree9adce18ee2d1302bb62d541f84216fcf034e3e8e
parent0b32edd66ab6a06eaad0b2c749d385a686ca8ffc
parent295f7fdd9aa9556b023d3e7cce312ed33d251020
Merge ... '295aed22d5a8b2aba3ea13993d33fdf1548e9f4a'
     and '64e3f453820277e4c667962fa8be6af48627f4fa'