[Xen-changelog] [xen-unstable] Merge

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ijc@xxxxxxxxxxxxxx>
# Date 1361020642 0
# Node ID 217a4fc4cd46e8de06f2f43eed727838891e9398
# Parent  e9ffe5331a157091af2fecef66c5a645144fa1b2
# Parent  58ea3679c131fc43ea4d8517930c5f671aabf992
Merge
---


diff -r e9ffe5331a15 -r 217a4fc4cd46 tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py       Fri Feb 15 14:30:06 2013 +0000
+++ b/tools/python/xen/xm/main.py       Sat Feb 16 13:17:22 2013 +0000
@@ -164,7 +164,7 @@ SUBCOMMAND_HELP = {
     'vcpu-pin'    : ('<Domain> <VCPU|all> <CPUs|all>',
                      'Set which CPUs a VCPU can use.'),
     'vcpu-set'    : ('<Domain> <vCPUs>',
-                     'Set the number of active VCPUs for allowed for the'
+                     'Set the number of active VCPUs allowed for the'
                      ' domain.'),
     #usb
     'usb-add'     : ('<domain> <[host:bus.addr] 
[host:vendor_id:product_id]>','Add the usb device to FV VM.'),

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog