merge of '188bf8cfee8efc3cb5e4670c99fcdb1dc6534bb2'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 13 Aug 2007 13:18:19 +0000 (13:18 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 13 Aug 2007 13:18:19 +0000 (13:18 +0000)
commitc7c81cd5132693b4541572ae5080b1912560c9a0
tree1fb3eb445d6149a207f206f118f4af8fff9e13b0
parent4630c0bfa9fc5d99b94bfed19f647fcb546ecea3
parentb534530b8cc4e34ca4301458bc0e5eeb64efbe08
Merge ... '188bf8cfee8efc3cb5e4670c99fcdb1dc6534bb2'
     and '83c27aa0850cb7750b6c99b01d999e085f33ddcc'