]> xenbits.xen.org Git - xenclient/toolstack.git/commit
Merge branch 'master' of git://git.uk.xensource.com/xenclient/toolstack
authorJon Ludlam <Jonathan.Ludlam@eu.citrix.com>
Tue, 25 Aug 2009 17:21:55 +0000 (18:21 +0100)
committerJon Ludlam <Jonathan.Ludlam@eu.citrix.com>
Tue, 25 Aug 2009 17:21:55 +0000 (18:21 +0100)
commit1178ad74521c1b22515b1474de72ccc518fe1ee9
tree62ae16ea679e63ecdad5cdf16f5654babc61744d
parentc9a1c2f8c8a6fad96d75aed43fbb5cd2000b9909
parentae0f2f9413ff3da346ee625f63280c80c11617fc
Merge branch 'master' of git://git.uk.xensource.com/xenclient/toolstack

Conflicts:

xenvm/tasks.ml
xenvm/tasks.ml
xenvm/xenvm.ml