From: Daniel Lezcano <daniel.lezcano@free.fr>
Date: Mon, 18 Mar 2013 22:17:00 +0000 (+0100)
Subject: Merge git://github.com/lxc/lxc
X-Git-Tag: lxc-2.1.1~2547
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7b2b9c7f9717fbcf8bb953bf5d1b4d4d9527f486;p=mirror_lxc.git

Merge git://github.com/lxc/lxc

Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr>
---

7b2b9c7f9717fbcf8bb953bf5d1b4d4d9527f486