Commit dc83d32ade04da29139837a24738238a10a8d0a7

Vicent Martí 2013-05-02T13:01:44

Merge pull request #1537 from ethomson/merge_warning_cleanup puns are not funny; type punning especially so