Merge
authorAlastair Tse <atse@xensource.com>
Fri, 3 Nov 2006 11:43:27 +0000 (11:43 +0000)
committerAlastair Tse <atse@xensource.com>
Fri, 3 Nov 2006 11:43:27 +0000 (11:43 +0000)

Trivial merge