Merge with tip
authorAlastair Tse <atse@xensource.com>
Thu, 2 Nov 2006 14:27:16 +0000 (14:27 +0000)
committerAlastair Tse <atse@xensource.com>
Thu, 2 Nov 2006 14:27:16 +0000 (14:27 +0000)

Trivial merge