merge of '0fe51495ad822c39d441e76fe38da75d576761b0'
authorHolger Freyther <zecke@selfish.org>
Sat, 31 Mar 2007 19:05:09 +0000 (19:05 +0000)
committerHolger Freyther <zecke@selfish.org>
Sat, 31 Mar 2007 19:05:09 +0000 (19:05 +0000)
commit296f6dfcaf7f4da87a87bfaa274a19cf43ae8011
tree38ba19888e76f1f03a35745ce5da335354d00a87
parent649c442569d4c7ce00d7c8634391f2e754bdf2f8
parented7c417090d4cc735c797e9ecfd1a49b071eb95f
Merge ... '0fe51495ad822c39d441e76fe38da75d576761b0'
     and 'a73ca61dee044168d70737f0c38567b825b10fb9'