Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager

diff --combined NodeManager.spec
index 5d06c15,855d2bf..80d2552
--- 1/NodeManager.spec
--- 2/NodeManager.spec
+++ b/NodeManager.spec
@@@ -1,8 -1,8 +1,8 @@@
  %define slicefamily %{pldistro}-%{distroname}-%{_arch}
  
  %define name NodeManager
- %define version 2.1
- %define taglevel 0
+ %define version 2.0
+ %define taglevel 34
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  
@@@ -32,8 -32,7 +32,8 @@@ Requires: python >= 2.
  Requires: python-pycurl
  # Signed tickets
  Requires: gnupg
 -# vuseradd, vuserdel
 +# vserver-sliceimage or lxc-sliceimage to be added explicitly in nodeimage.pkgs
 +# we do need the slice images in any case
  Requires: sliceimage-%{slicefamily}
  # our interface to the vserver patch
  Requires: util-vserver >= 0.30.208-17