merge of 'a3549da277d64582d767250d3fc1be4d13b2f761'
authorGraeme Gregory <dp@xora.org.uk>
Fri, 21 Dec 2007 10:29:08 +0000 (10:29 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 21 Dec 2007 10:29:08 +0000 (10:29 +0000)
     and 'f375863f1941d0ebb0222050ebdaa90c2d76f42b'


Trivial merge