merge of '8725fc715529f6dba921a0a92e01e4e68124bfdb'
authorHolger Freyther <zecke@selfish.org>
Fri, 25 Jan 2008 17:37:04 +0000 (17:37 +0000)
committerHolger Freyther <zecke@selfish.org>
Fri, 25 Jan 2008 17:37:04 +0000 (17:37 +0000)
     and '9f6c6e0638e90b5a038c5a87f9d87060ab2a3dbf'


Trivial merge