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

Trivial merge