Merge.
authorSteven Smith <ssmith@xensource.com>
Tue, 31 Oct 2006 11:44:47 +0000 (11:44 +0000)
committerSteven Smith <ssmith@xensource.com>
Tue, 31 Oct 2006 11:44:47 +0000 (11:44 +0000)

Trivial merge