From: Vincent Hanquez <vincent.hanquez@eu.citrix.com>
Date: Fri, 12 Jun 2009 17:51:40 +0000 (+0100)
Subject: Merge branch 'master' of git://git.uk.xensource.com/xenclient/toolstack
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b776d992b8d5cf2d4cce46de0a256c857b16a4fe;p=xenclient%2Ftoolstack.git

Merge branch 'master' of git://git.uk.xensource.com/xenclient/toolstack

Conflicts:
	xenvm/xenvm.ml
---

b776d992b8d5cf2d4cce46de0a256c857b16a4fe