Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Tue, 30 Jan 2007 11:57:56 +0000 (11:57 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Tue, 30 Jan 2007 11:57:56 +0000 (11:57 +0000)

Trivial merge