merge of '4b397824de03002b9957b412e8f6f2dc0f2d48be'
authorHolger Freyther <zecke@selfish.org>
Thu, 27 Dec 2007 03:13:15 +0000 (03:13 +0000)
committerHolger Freyther <zecke@selfish.org>
Thu, 27 Dec 2007 03:13:15 +0000 (03:13 +0000)
     and '9374f52664bf8a853a6627bbfbfb8a205b757138'


Trivial merge