merge of '49e541f0397109bdc6530a7380f2980a60d577ba'
authorHolger Freyther <zecke@selfish.org>
Thu, 17 May 2007 17:05:45 +0000 (17:05 +0000)
committerHolger Freyther <zecke@selfish.org>
Thu, 17 May 2007 17:05:45 +0000 (17:05 +0000)
     and '5ae66edc366deb29cb20b1ba5074e69862e0d59a'


Trivial merge