merge of '3447c93047f153922a4e64420c682c7b0d9f6e9a'
authorGraeme Gregory <dp@xora.org.uk>
Fri, 21 Mar 2008 07:36:54 +0000 (07:36 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 21 Mar 2008 07:36:54 +0000 (07:36 +0000)
     and '5c982728e5a62f54dc68215741872afd778656a8'


Trivial merge