Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Mon, 8 Jan 2007 14:25:14 +0000 (14:25 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Mon, 8 Jan 2007 14:25:14 +0000 (14:25 +0000)

Trivial merge