merge of '4e669af0ea55b9b9ba44d6dc7d149da48ab9b139'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 10 Oct 2007 09:18:39 +0000 (09:18 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 10 Oct 2007 09:18:39 +0000 (09:18 +0000)
commite45a2c703a0971966bcf2ac4537776aec0125287
treef89858c35e2fdb2ae286883c76c41249d1ebbff8
parent1185f4afa35f26f7ce9e135d3d96c52e3a024c29
parent288c0fb960bdb5f6e58cf0f67ab197744fd08aec
Merge ... '4e669af0ea55b9b9ba44d6dc7d149da48ab9b139'
     and 'af0790bf9393bac4ed622dfd962d7bf5512bd7e4'