]> xenbits.xensource.com Git - xenclient/toolstack.git/commitdiff
Merge branch 'master' of git://git.uk.xensource.com/xenclient/toolstack
authorVincent Hanquez <vincent.hanquez@eu.citrix.com>
Fri, 12 Jun 2009 17:51:40 +0000 (18:51 +0100)
committerVincent Hanquez <vincent.hanquez@eu.citrix.com>
Fri, 12 Jun 2009 17:51:40 +0000 (18:51 +0100)
Conflicts:
xenvm/xenvm.ml


Trivial merge