merge of '1c37802f675e2b4ebbb302f90f516adf37617e96'
authorGraeme Gregory <dp@xora.org.uk>
Mon, 5 Nov 2007 19:59:01 +0000 (19:59 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Mon, 5 Nov 2007 19:59:01 +0000 (19:59 +0000)
     and 'ef25a12d53bd49cd4c94de426d2b1c981c967f93'


Trivial merge