Merge branch 'master' into lxc_devel
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 31 Aug 2012 10:00:11 +0000 (12:00 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 31 Aug 2012 10:00:11 +0000 (12:00 +0200)
commitb8a1ca92870ffab4248d62b4f043791f235c0dd0
tree6426be790632ccb22ea94ece44c5f80faf331982
parent1a73f751ac9c47c2805ca115eec945425901e2d0
parentb55940dc66e561b2f186fba8202098d809070a1c
Merge branch 'master' into lxc_devel