merge
authorIan.Campbell@xensource.com <Ian.Campbell@xensource.com>
Wed, 11 Jan 2006 16:26:04 +0000 (16:26 +0000)
committerIan.Campbell@xensource.com <Ian.Campbell@xensource.com>
Wed, 11 Jan 2006 16:26:04 +0000 (16:26 +0000)

Trivial merge