Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Thu, 9 Nov 2006 16:06:43 +0000 (16:06 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Thu, 9 Nov 2006 16:06:43 +0000 (16:06 +0000)

Trivial merge