ErikZalm/Marlin — pull request #262 by markfinn (2012-10-09 19:54:23+00:00)
Title: Remove unwanted artifacts in merge of bed-pid tree

This undoes the parts that shouldn't have some into the mainline.

Thanks for your time.