bgilbert/opendiamond — pull request #6 by hongjaic (2012-05-08 23:01:20+00:00)
Title: Fixed Brokenness

User cherry-pick to copy individual commits, and fixed brokenness.