Merge branch 'lxc-capabilities-experiment' into lxc
authorAntoine Catton <acatton@tiolive.com>
Tue, 31 Jul 2012 08:07:17 +0000 (17:07 +0900)
committerAntoine Catton <acatton@tiolive.com>
Tue, 31 Jul 2012 08:07:17 +0000 (17:07 +0900)
commit84ac80efd2cb4d7365555c405d660654a775adee
treec25e88b55b0e28396bba5428b8ca3ad8ae84b711
parent9e57d543a63142bd274145d725b46f59565337e0
parent7cc4e9dbb4a14a2e6e25bc5eb72698db37632f95
Merge branch 'lxc-capabilities-experiment' into lxc

Conflicts:
component/libcap/buildout.cfg
component/lxc/buildout.cfg