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)
commit6ec82e6a49df218bcbf4337d85d8d87dc8273824
tree78da8d687c99654f966db3e82d28cd8be410fcc6
parent4c941ea3937af717d1c03ba3879774bf20a12e06
parent8edf881ae2829d4bf4dcb1911dc86332de30c807
merged master into lxc_devel