merge of 'a2a88493748857f520eccb0e35d7277af6762e61'
authorHolger Freyther <zecke@selfish.org>
Sun, 1 Apr 2007 18:01:44 +0000 (18:01 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 1 Apr 2007 18:01:44 +0000 (18:01 +0000)
     and 'fad527d227dd0598909d19a70f175bd576271455'


Trivial merge