]> xenbits.xen.org Git - xenclient/toolstack.git/commit
Merge commit 'prashanthm/master'
authorVincent Hanquez <vincent.hanquez@eu.citrix.com>
Tue, 7 Jul 2009 21:59:44 +0000 (22:59 +0100)
committerVincent Hanquez <vincent.hanquez@eu.citrix.com>
Tue, 7 Jul 2009 21:59:44 +0000 (22:59 +0100)
commitfc912aefbac997a96084cb86ee7d3347cc119791
treec5b725e3667c1ef48915e28e13d22c1a0f29bd8f
parentb04c2953ec89df1e1159c2e6d3fd40f31fc48c00
parent690da83d73c32364a09bbb882f5c9388d0b30bcd
Merge commit 'prashanthm/master'

Conflicts:
xenvm/vmact.ml
xenvm/vmconfig.ml
xenvm/vmact.ml
xenvm/vmconfig.ml