merge of '7bc7d5c3532bb5efc024410e9d74cc23ebeb80c4'
authorMatthias Hentges <oe@hentges.net>
Sat, 9 Jun 2007 21:54:47 +0000 (21:54 +0000)
committerMatthias Hentges <oe@hentges.net>
Sat, 9 Jun 2007 21:54:47 +0000 (21:54 +0000)
commitcc478760ffe73da7d2048c9d3a1f530544b4ebe1
treebcac43fb846e5b17892f3762d3994bc595b46d0a
parent6c926c2feb610fda34a3c9bce2cc417f8fd6a175
parent609871ae041cac81dbab5ebcd43520634f627dd2
Merge ... '7bc7d5c3532bb5efc024410e9d74cc23ebeb80c4'
     and 'adf85b1ec40339e44983ef65acf414d9ad5ed6a4'