merge of '51a33385cc433c55cd19bd8dc3705adb1e86f59a'
authorHolger Freyther <zecke@selfish.org>
Thu, 24 May 2007 17:37:46 +0000 (17:37 +0000)
committerHolger Freyther <zecke@selfish.org>
Thu, 24 May 2007 17:37:46 +0000 (17:37 +0000)
     and '7efadd625919e78e49dfd108fff87b192f63f3fa'


Trivial merge