Merge branch 'lxc'
authorAntoine Catton <acatton@tiolive.com>
Mon, 27 Aug 2012 01:04:35 +0000 (10:04 +0900)
committerAntoine Catton <acatton@tiolive.com>
Mon, 27 Aug 2012 01:04:35 +0000 (10:04 +0900)
commit2d05ad6c49653d1e8a8679129b48aba8819c7bf3
treebdeda1ab208726f130d7c67a6627edcad2117b50
parenta54461cde3a84f98cc9d77d18ce7f528616a20c3
parenta7c0ff1e5245639e3e3b4fb505ca0c60c63d241d
Merge branch 'lxc'

Conflicts:
setup.py
setup.py
software/lxc/software.cfg