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

Merge bug fix from dotcloud/docker master