Merge branch 'master' of git://github.com/dotcloud/docker into 3605-fix-populate-volumes-from-with-container-data

Conflicts:
	container.go

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)