merge of '8e91c5efc3e57c7b54e4a849b3b21eaf9a7dfe75'
authorHolger Freyther <zecke@selfish.org>
Wed, 12 Mar 2008 10:49:22 +0000 (10:49 +0000)
committerHolger Freyther <zecke@selfish.org>
Wed, 12 Mar 2008 10:49:22 +0000 (10:49 +0000)
     and '9db805dedc7ef9df0a7c5cd755837e4917852f70'


Trivial merge