conformal/xombrero — pull request #48 by trondd555 (2014-03-12 01:15:13+00:00)
Title: Fix duplicate definitions in Mavericks

Works in Mavericks but I'm not able to test it anywhere else.