Merge.
authorSteven Smith <ssmith@xensource.com>
Tue, 31 Oct 2006 10:12:35 +0000 (10:12 +0000)
committerSteven Smith <ssmith@xensource.com>
Tue, 31 Oct 2006 10:12:35 +0000 (10:12 +0000)

Trivial merge