Merge branch 'libvirt-prereq-network' of https://github.com/jpoimboe/docker
Merge branch 'master' of https://github.com/dotcloud/docker
Merge branch 'master' of https://github.com/dotcloud/docker
Merge branch 'master' of https://github.com/dotcloud/docker
move resize to job
Merge pull request #3187 from vieux/resize_job

Move resize to job