Merge.
authorrjones@intel.home.annexia.org <rjones@intel.home.annexia.org>
Mon, 12 May 2008 14:03:02 +0000 (15:03 +0100)
committerrjones@intel.home.annexia.org <rjones@intel.home.annexia.org>
Mon, 12 May 2008 14:03:02 +0000 (15:03 +0100)

Trivial merge