Index: trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-listvms
===================================================================
--- trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-listvms	(revision 550)
+++ trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-listvms	(revision 551)
@@ -5,4 +5,5 @@
 sys.path.insert(0, '/usr/lib/xen-3.1-1/lib/python')
 from xen.lowlevel.xs import xs
+import yaml
 
 trans = xs()
@@ -36,7 +37,3 @@
 if __name__ == '__main__':
     vms = live_vms()
-    if '--pickle' in sys.argv[1:]:
-        import cPickle
-        cPickle.dump(vms, sys.stdout, cPickle.HIGHEST_PROTOCOL)
-    else:
-        print vms
+    print yaml.safe_dump(vms, default_flow_style=False)