incorporate changelog from 2.0

diff --cc nodemanager-lib.spec
index 3fd5b9c,eb54716..2974293
--- 1/nodemanager-lib.spec
--- 2/nodemanager-lib.spec
+++ b/nodemanager-lib.spec
@@@ -128,19 -124,11 +128,22 @@@ rm -rf $RPM_BUILD_ROO
  %{_initrddir}/
  %{_sysconfdir}/logrotate.d/nodemanager
  /var/lib/
 +/bin/sshsh
 +%{python_sitearch}/bwlimitlxc.py*
  
  %changelog
+ * Tue Jun 26 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-38
+ - split packaging, nodemanager-vs (obsoletes NodeManager) and nodemanager-lib
+ 
 +* Mon Jun 25 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-3
 +- renamed bwlimit as bwlimitlxc to avoid conflicts with util-vserver-pl
 +- purpose being to be able to run this branch on vserver nodes as well
 +
 +* Thu Jun 21 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-2
 +- merged nodemanager-2.0-37 in 2.1/lxc_devel and add initscript support to lxc
 +- passes tests with lxc but won't build against vs due to conflict
 +- as bwlimit.py also ships with util-vserver-pl
 +
  * Thu Jun 21 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-37
  - refactoring: isolate initscript functionality
  - aimed at making initscript implementation with lxc straightforward

diff --cc nodemanager-vs.spec
Simple merge