Merge branch 'master' into lxc_devel - changelog from 2.0-37
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 21 Jun 2012 08:07:20 +0000 (10:07 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 21 Jun 2012 08:07:20 +0000 (10:07 +0200)
commitdd451f27a57f53eb716aaf3ff9b545953df8882a
tree570e5f25eed7ea06f1cf4edd83d266379487bf56
parent1981b70847cb752a184bd06d6912b95d022f405f
parent311cd566040f87d49b3b3d21ed9f027f96be1e58
Merge branch 'master' into lxc_devel - changelog from 2.0-37
NodeManager.spec