merge of '005491f350146d41b598e61470a349d6466dbd0d'
authorHolger Freyther <zecke@selfish.org>
Tue, 6 Mar 2007 22:22:18 +0000 (22:22 +0000)
committerHolger Freyther <zecke@selfish.org>
Tue, 6 Mar 2007 22:22:18 +0000 (22:22 +0000)
commitc38184d0a897b3d15a545c67d618e83b36e22fa0
tree9f388f4f5a4e442c9e9e58ba8933fa030184be61
parentec2f31c4c67656bb4b51384954baece702983cfc
parent15846f12217639cd2a26b369a847bbf541542069
Merge ... '005491f350146d41b598e61470a349d6466dbd0d'
     and '906d58269912b71d4b883f2167935ffe376e85e8'