Merge
authorAlastair Tse <atse@xensource.com>
Thu, 2 Nov 2006 18:52:04 +0000 (18:52 +0000)
committerAlastair Tse <atse@xensource.com>
Thu, 2 Nov 2006 18:52:04 +0000 (18:52 +0000)

Trivial merge