merge of '25c6c2c84233203b8c3f1a65223fc9904814cfe2'
authorHolger Freyther <zecke@selfish.org>
Sun, 6 Jan 2008 22:51:34 +0000 (22:51 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 6 Jan 2008 22:51:34 +0000 (22:51 +0000)
     and '478b52f76ea3d55c9536816c3480d56ebcccc96d'


Trivial merge