Merge branch 'master' into lxc_devel

diff --cc NodeManager.spec
index b9ea66f,6320d71..9ed035a
--- 1/NodeManager.spec
--- 2/NodeManager.spec
+++ b/NodeManager.spec
@@@ -130,9 -129,12 +130,13 @@@ rm -rf $RPM_BUILD_ROO
  %{_initrddir}/
  %{_sysconfdir}/logrotate.d/nodemanager
  /var/lib/
 +/bin/sshsh
  
  %changelog
+ * Fri Dec 09 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-34
+ - Added memory scheduling to core scheduler
+ - Core scheduler will now attempt to schedule cores on the same CPU to a slice, if a slice uses multiple cores
+ 
  * Thu Jul 07 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-33
  - tweaked log policy for the core scheduler
  - curlwrapper has an optional verbose mode