merge
authorIan Campbell <ian.campbell@xensource.com>
Fri, 5 Jan 2007 10:40:19 +0000 (10:40 +0000)
committerIan Campbell <ian.campbell@xensource.com>
Fri, 5 Jan 2007 10:40:19 +0000 (10:40 +0000)

Trivial merge