Merge branch 'edge' of github.com:Smoothieware/Smoothieware into edge
authorJim Morris <wolfmanjm@gmail.com>
Mon, 6 Oct 2014 19:53:00 +0000 (12:53 -0700)
committerJim Morris <wolfmanjm@gmail.com>
Mon, 6 Oct 2014 19:53:00 +0000 (12:53 -0700)

Trivial merge