[merge] with xen-unstable
authorChristian Limpach <Christian.Limpach@xensource.com>
Fri, 19 Jan 2007 15:11:44 +0000 (15:11 +0000)
committerChristian Limpach <Christian.Limpach@xensource.com>
Fri, 19 Jan 2007 15:11:44 +0000 (15:11 +0000)
Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>

Trivial merge