Merge branch 'master' of ssh://scripts@scripts.mit.edu/mit/scripts/git/xen

Conflicts:

	scripts-server

Previously uncommitted changes - add whole-enchilada, and reindent

diff --cc scripts-server
index 4b78a03bab21baf5d6b28e0620b24db50bebb42e,d665280a08331a3728a986584385e702893ff952..377e277cf3db212ec9f9d35400257709a59b0b71
--- 1/scripts-server
--- 2/scripts-server
+++ b/scripts-server
@@@ -11,12 -11,11 +11,12 @@@
  vm_host = 0
  vm_mem  = 1
  vm_mac5 = 2
 -machines = { 'bees-knees'   : ['not-forward',  4096, 10],
 -             'cats-whiskers': ['not-forward',  7168, 20],
 -             'not-backward' : ['not-forward',  2048, 30],
 -             'busy-beaver'  : ['conan-obrien', 3072, 40],
 -             'pancake-bunny': ['conan-obrien', 3072, 50],
 +machines = { 'bees-knees'     : ['not-forward',  4096, 10],
-              'cats-whiskers'  : ['not-forward',  4096, 20],
-              'not-backward'   : ['not-forward',  4096, 30],
++             'cats-whiskers'  : ['not-forward',  7168, 20],
++             'not-backward'   : ['not-forward',  2048, 30],
 +             'busy-beaver'    : ['conan-obrien', 3072, 40],
 +             'pancake-bunny'  : ['conan-obrien', 3072, 50],
 +             'whole-enchilada': ['conan-obrien', 3072, 60],
             }
  vm = machines[machine_name]