Merge branch 'master' into lxc_devel
[nodemanager.git] / initscripts / conf_files
2010-01-20 Thierry Parmentelatrevised layout