merge of '39030d97b266cc74d362571046ff686f9fa4b71c'
authorHolger Freyther <zecke@selfish.org>
Wed, 7 Mar 2007 00:43:45 +0000 (00:43 +0000)
committerHolger Freyther <zecke@selfish.org>
Wed, 7 Mar 2007 00:43:45 +0000 (00:43 +0000)
commitef577a4a45dc409f13b78925308dd25c646e92ce
treef7f2e1d43040ce79799962b799c66d1045cc325b
parentdeacf77e13e6f1f450d1f9e91a466c387c8494f0
parent4cc0ce6d895a1df9c46226d47041bc0130298b5b
Merge ... '39030d97b266cc74d362571046ff686f9fa4b71c'
     and 'efc288dfca6db8af7c6c350c1661838d4c1433c8'