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)
commitad909125e601f5ac8e2de458dbeea845930a4dc7
treed0e81a505e0f200a83ec8d6d1e4370fce3602ccb
parentf445e6d0f90b8bcce3cb8a95c40f7e56c821661e
parent34bc75be8e4f52841094c140aac1de9ca88d15fe
Merge ... 'd31528c971eb974748d7b182b56381c6f4b7ab55'
     and 'ea47db0fd7281e15db0ba80201db5fc61a11455f'