merge of '44cb388c967771c3afb8acffa545cc8473c203a9'
authorGraeme Gregory <dp@xora.org.uk>
Wed, 5 Mar 2008 16:51:54 +0000 (16:51 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Wed, 5 Mar 2008 16:51:54 +0000 (16:51 +0000)
     and '795685d9c4cce2768321f029142a0224520964b7'


Trivial merge