merge of '526a073fc87c09567076f347f0e042c0aa8a264a'
authorHolger Freyther <zecke@selfish.org>
Fri, 28 Jul 2006 13:53:32 +0000 (13:53 +0000)
committerHolger Freyther <zecke@selfish.org>
Fri, 28 Jul 2006 13:53:32 +0000 (13:53 +0000)
commite0a46afb92dc8ab04ed07cf5588fcd9aa350d2b1
tree140fe8a6a208e4703cce2bace243a664741181bb
parent3b822750043671741665751ff3f28ba2f98a136e
parentc563259462c772806dd55438471d54f3432da5f4
Merge ... '526a073fc87c09567076f347f0e042c0aa8a264a'
     and 'd9d274079b360d07c0675fde77410b26827a2295'