merged master into lxc_devel
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 19 Jun 2012 21:05:56 +0000 (23:05 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 19 Jun 2012 21:05:56 +0000 (23:05 +0200)

Trivial merge