Merge
authorAlastair Tse <atse@xensource.com>
Fri, 10 Nov 2006 12:49:54 +0000 (12:49 +0000)
committerAlastair Tse <atse@xensource.com>
Fri, 10 Nov 2006 12:49:54 +0000 (12:49 +0000)

Trivial merge