Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Wed, 18 Oct 2006 13:36:20 +0000 (14:36 +0100)
committerTim Deegan <Tim.Deegan@xensource.com>
Wed, 18 Oct 2006 13:36:20 +0000 (14:36 +0100)

Trivial merge