Merge pull request #71 from crosbymichael/fix-dummy-import

Rename dummy in driver.go to vfs
Added a Supervisor process management example
Merge pull request #68 from crosbymichael/daemon-docs

Add daemon docs with selecting graph driver
Fix data race in TestLogEvent

Found with -race. Improve locking on Server.
Reduce debugf frequency to avoid terminal freeze
Merge pull request #2848 from pnasrat/713-data-races

Fix data race in TestLogEvent
Merge pull request #2833 from twillouer/patch-1

Better copy/paste :)
Merge pull request #2835 from fj/topic/update-native-installation-instructions

Use requirements.txt rather than manual installation for docs
Merge pull request #2836 from fj/topic/spinx⇒sphinx

Corrects misspellings of 'Sphinx'
Merge pull request #2849 from jamtur01/supervisor

Added a Supervisor process management example
docker in-container process management with CFEngine
Merge pull request #2853 from estenberg/cfe-docker-process

docker in-container process management with CFEngine
Merge pull request #2725 from SvenDowideit/docker-export-doc

add 'to STDOUT' to the help and give an example
Merge pull request #72 from shykes/creack-reduce-debug

Reduce debugf frequency to avoid terminal freeze
Merge pull request #2804 from tianon/fix-hack-git-assumption

Hack: add support for compiling using make.sh without '.git'
Merge branch 'master' into 0.6.5-dm-plugin
Merge pull request #2837 from shykes/0.7-names

New collection of random names for 0.7
Docs: update install pages (ubuntu and kernel requirements) to reflect the optional nature of AUFS
Merge pull request #2609 from shykes/0.6.5-dm-plugin

Move aufs to a storage driver, add devicemapper and dummy drivers
Merge branch 'master' into use_utc_time

Conflicts:
	image.go