merge
authorIan.Campbell@xensource.com <Ian.Campbell@xensource.com>
Wed, 11 Jan 2006 18:22:24 +0000 (18:22 +0000)
committerIan.Campbell@xensource.com <Ian.Campbell@xensource.com>
Wed, 11 Jan 2006 18:22:24 +0000 (18:22 +0000)

Trivial merge