Merge pull request #31 from shykes/shykes-0.6.5-dm-plugin

Merge from dotcloud/docker master
Fix the brittle errorstring-to-httperror recognition code which in turn is required by autopull (the client issues a pull if container creation returns 404)
Merge pull request #2704 from shykes/fix-auto-pull

Fix the brittle errorstring-to-httperror recognition code
Merge branch 'master' into shykes-0.6.5-dm-plugin