merge of '44766714d588caf0607b7f0e513a17f06efead43'
authorHolger Freyther <zecke@selfish.org>
Mon, 19 Feb 2007 17:01:12 +0000 (17:01 +0000)
committerHolger Freyther <zecke@selfish.org>
Mon, 19 Feb 2007 17:01:12 +0000 (17:01 +0000)
commite1268ca3f8a88713275e1697db3991de31905e20
tree040095625afee9dc41d33b865b2f031f258457de
parenta6bf9a11ca4488cbe5f3e7e75f68c7346603252b
parent432557e2373ab65916ae40b9055e6bfb7a6729d1
Merge ... '44766714d588caf0607b7f0e513a17f06efead43'
     and '7eec4d1323cba61be89ecb9fa8d18fca19b81780'