Merge with xen-ia64-unstable.hg
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Thu, 18 Jan 2007 18:25:04 +0000 (18:25 +0000)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Thu, 18 Jan 2007 18:25:04 +0000 (18:25 +0000)
1  2 
tools/ioemu/vl.c
tools/python/xen/xend/image.py

Simple merge
Simple merge