Guillaume J. Charmes f83e69dc32 Merge branch 'master' into dm ...

Conflicts:
	Dockerfile
	buildfile.go
	container.go
	hack/make/test
	runtime_test.go
	utils/utils.go
Upstream-commit: e9ee860c91b6e9cdcafc03cff9941affb6341a0d
Component: engine

2013-10-18 12:38:29 -07:00

..

engine

Merge branch 'master' into dm

2013-10-18 12:38:29 -07:00