merge of '706e9716e7abeb578efbb0d1222beef485b5212d'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 17 Oct 2007 08:56:33 +0000 (08:56 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 17 Oct 2007 08:56:33 +0000 (08:56 +0000)
     and 'f3dcecae6a28a4d7f2a075677715e68f66d2ac01'


Trivial merge