Merge branch 'add-libcontainer' of https://github.com/crosbymichael/docker into add-libcontainer

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)