merge of '6047723508e3b6eeb7bb92d452b11b5e946540bf'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 12 Mar 2008 22:29:15 +0000 (22:29 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 12 Mar 2008 22:29:15 +0000 (22:29 +0000)
commit4e3f09a4cf3647cffa687723676aecb53316da53
treeab5fe51fc7a7ed15209dff7413f3c4e43ce9cd64
parentcec1b020d3e88d90cd1aa209f69d28a0e322eb93
parentf336f885a5f0de0a94ff57f5136741ca319efe8c
Merge ... '6047723508e3b6eeb7bb92d452b11b5e946540bf'
     and 'd30c6b8bd3c20b5346a9fd726b241df1917bf08e'