merge of 'a2a88493748857f520eccb0e35d7277af6762e61'
authorHolger Freyther <zecke@selfish.org>
Sun, 1 Apr 2007 18:01:44 +0000 (18:01 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 1 Apr 2007 18:01:44 +0000 (18:01 +0000)
commitbf9e41fe9f2719ab6c274c3e7a3044761ea5f85a
tree6478123adbf2e5d7d4845fdfef0e5006cb272f90
parented04b33fd238b6cdae27bcba812adf4a296b4da0
parentafc1acb3dba12c57813ce66d73ade56c993a0b18
Merge ... 'a2a88493748857f520eccb0e35d7277af6762e61'
     and 'fad527d227dd0598909d19a70f175bd576271455'