merge of '8723751526ceecdd63a4b78f1669ae780793d31c'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Fri, 25 Aug 2006 10:18:43 +0000 (10:18 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Fri, 25 Aug 2006 10:18:43 +0000 (10:18 +0000)
commit27db0a385caecaa95baf6406d7a5cc7889d397a0
treee8326b05d0b31469417864d1712dd639d10742e7
parent27d718fcf90567a8be2f694e01a6878d1a070118
parent6a96d189f181e57619d0c20cbae1b926953f10d9
Merge ... '8723751526ceecdd63a4b78f1669ae780793d31c'
     and '916afd44c39ce855a02330e67657b5b7847da659'