Merge
authorAlastair Tse <atse@xensource.com>
Thu, 9 Nov 2006 13:18:58 +0000 (13:18 +0000)
committerAlastair Tse <atse@xensource.com>
Thu, 9 Nov 2006 13:18:58 +0000 (13:18 +0000)

Trivial merge