merge of '5e882379581ef1c98dcefe18574deaaaffd59a0a'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 28 Apr 2008 11:23:30 +0000 (11:23 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 28 Apr 2008 11:23:30 +0000 (11:23 +0000)
     and '737469a743274fa1dd75ddf61b7dd12da385ed96'


Trivial merge