merge of '453235132f7854f1822704d1398a978b23b4a64a'
authorHolger Freyther <zecke@selfish.org>
Sat, 15 Mar 2008 21:00:02 +0000 (21:00 +0000)
committerHolger Freyther <zecke@selfish.org>
Sat, 15 Mar 2008 21:00:02 +0000 (21:00 +0000)
commite55e3eb69ae01e7be2208d7ee12065d257f7f55d
tree8a2037cbd1057516f7950738044091e495403ce1
parent15583248362ff2562d5fcb02c1462864dd00e349
parent725a308369696af4afa29db22b164f98e7a34ba0
Merge ... '453235132f7854f1822704d1398a978b23b4a64a'
     and 'be98f2c49ea68651e064574cc2379f2e04febe3c'