merge
authorIan.Campbell@xensource.com <Ian.Campbell@xensource.com>
Fri, 27 Jan 2006 11:51:57 +0000 (11:51 +0000)
committerIan.Campbell@xensource.com <Ian.Campbell@xensource.com>
Fri, 27 Jan 2006 11:51:57 +0000 (11:51 +0000)

Trivial merge