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)
commitd7e6e992bacfc66e537d5683adf628570ee3f874
treeca985888a44a6ac7334eb162995cd6e8ffa271c2
parent58a900eb85997d5149de8690e1f68d49bb845121
parentd56b2bb2b2fc7c78ef3c405336187926464943ed
Merge ... '4b397824de03002b9957b412e8f6f2dc0f2d48be'
     and '9374f52664bf8a853a6627bbfbfb8a205b757138'