merge of '25c6c2c84233203b8c3f1a65223fc9904814cfe2'
authorHolger Freyther <zecke@selfish.org>
Sun, 6 Jan 2008 22:51:34 +0000 (22:51 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 6 Jan 2008 22:51:34 +0000 (22:51 +0000)
commit46fddaad9897d1143ed76e99bf7cde12809b924c
treee8ea27b3f0ddd75619441073a3b6501cab4ace5b
parente152b2196bee93cbefe5a576d8649cc7388aa435
parent8400f7b23ba4b37f004a21c82d19dd9947350142
Merge ... '25c6c2c84233203b8c3f1a65223fc9904814cfe2'
     and '478b52f76ea3d55c9536816c3480d56ebcccc96d'