merge of 'c4435e84c90ba841930a612af7c532b832a0e612'
authorGraeme Gregory <dp@xora.org.uk>
Fri, 18 Apr 2008 19:17:27 +0000 (19:17 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 18 Apr 2008 19:17:27 +0000 (19:17 +0000)
commit99fcfac46d2eda974beda27b6c8367a657d50c45
tree67f2c8a747d3ce434bd35d58143184bb611d5766
parent08a90416dfacd1283401ef640a5656f60af4b207
parentf4dadcb85985a69a58cb471dbef2a4b711857fed
Merge ... 'c4435e84c90ba841930a612af7c532b832a0e612'
     and 'd80795e44adf312443a758931387dd699d47b8de'