Merge branch 'master' into lxc_devel - changelog from 2.0-37

diff --cc NodeManager.spec
index 58778e7,a9fe8e8..686ed24
--- 1/NodeManager.spec
--- 2/NodeManager.spec
+++ b/NodeManager.spec
@@@ -134,10 -130,14 +134,16 @@@ rm -rf $RPM_BUILD_ROO
  %{_initrddir}/
  %{_sysconfdir}/logrotate.d/nodemanager
  /var/lib/
 +/bin/sshsh
 +%{python_sitearch}/bwlimit.py*
  
  %changelog
+ * 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
+ - show stack trace when module loading fails
+ - accounts.py renamed into account.py for consistency
+ 
  * Sun Jun 03 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-36
  - /var/log/nodemanager shows duration of mainloop