merge of '6f1ed32f3107efcffe73ac9ab6ad5ae91a60c3da'
authorHolger Freyther <zecke@selfish.org>
Sat, 11 Nov 2006 22:21:09 +0000 (22:21 +0000)
committerHolger Freyther <zecke@selfish.org>
Sat, 11 Nov 2006 22:21:09 +0000 (22:21 +0000)
commit8bad4242b4213a4daf61c9753e605327e41b9891
tree6fe6f5e70e603500bb44c66016f7fbd687bb661b
parent163652f7fb3d27a7efabe76c35f5b903b74bc8a7
parent3365c434187111a1e173d0d1aa7d59be50fe71ae
Merge ... '6f1ed32f3107efcffe73ac9ab6ad5ae91a60c3da'
     and 'c64b8ff663e5e621de3a4bdde27cd3216dce0676'