Merge branch 'master' into lxc_devel
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 11 Apr 2012 13:12:35 +0000 (15:12 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 11 Apr 2012 13:12:35 +0000 (15:12 +0200)
commit0a520a0ca91980d6d7d235a18366b0f486c8f2f5
treeb568cee00c6c7c10dc6ca372733f10449727fe50
parent479a2a8bff04e25fe4527e1ef2198175fead4538
parent68eef50d9f35e3cab248f0212007b84c110cf4cb
Merge branch 'master' into lxc_devel