merge of '1fb08a078d2758934f02fa5ac848b7c6a7e2cb31'
authorGraeme Gregory <dp@xora.org.uk>
Sat, 20 Oct 2007 09:33:22 +0000 (09:33 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Sat, 20 Oct 2007 09:33:22 +0000 (09:33 +0000)
     and '6826902a15e323563ac6b3f1a902a98dcabe27e9'


Trivial merge