Merge branch 'master' of ssh://git.planet-lab.org/git/nodemanager

diff --combined nodemanager-lxc.spec
index 6a3e4b7,847cb20..7d82875
--- 1/nodemanager-lxc.spec
--- 2/nodemanager-lxc.spec
+++ b/nodemanager-lxc.spec
@@@ -32,8 -32,6 +32,8 @@@ Requires: python-inotif
  Requires: nodemanager-lib
  # the lxc-specific tools for using slice images
  Requires: lxc-sliceimage
 +Requires: openvswitch
 +Requires: sliceimage-lxc >= 5.1-3
  
  %description
  nodemanager-lxc provides the lxc code for the PlanetLab Node Manager.
@@@ -58,6 -56,9 +58,9 @@@ rm -rf $RPM_BUILD_ROO
  %{_datadir}/NodeManager/
  
  %changelog
+ * Thu Oct 18 2012 Scott Baker <smbaker@gmail.com> - nodemanager-2.1-11
+ - Support for freezing BestEffort slices for Vicci
+ 
  * Wed Sep 05 2012 Andy Bavier <acb@cs.princeton.edu> - nodemanager-2.1-10
  - Change to use new vsh (wrapper for lxcsu)