merge of 'd31528c971eb974748d7b182b56381c6f4b7ab55'
authorHolger Freyther <zecke@selfish.org>
Tue, 22 Jan 2008 08:49:38 +0000 (08:49 +0000)
committerHolger Freyther <zecke@selfish.org>
Tue, 22 Jan 2008 08:49:38 +0000 (08:49 +0000)
     and 'ea47db0fd7281e15db0ba80201db5fc61a11455f'


Trivial merge