Merge branch 'master' into lxc_devel
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 20 Jun 2012 06:34:12 +0000 (08:34 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 20 Jun 2012 06:34:12 +0000 (08:34 +0200)
commit0f51f7fc64906f87640def6f27a1dc732ed8f453
tree8a40304ed5908b153e7487fc9b4db32b7e300cd8
parent4e914a61aa13f98463d7b16597848d97c17180e2
parent6babe464de8180df852af505e0386c5ff4ea8c2c
Merge branch 'master' into lxc_devel