- 
Committer:
Martin Pool
- 
Date:
2005-08-29 10:57:01 UTC
- 
mfrom:
(1092.1.41)
- 
Revision ID:
mbp@sourcefrog.net-20050829105701-7aaa81ecf1bfee05
- merge in merge improvements and additional tests 
  from aaron and lifeless
robertc@robertcollins.net-20050825131100-85772edabc817481