Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Thu, 8 Feb 2007 13:43:19 +0000 (13:43 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Thu, 8 Feb 2007 13:43:19 +0000 (13:43 +0000)

Trivial merge