Commit 5edb846e03961cac06d1aab4cb5e2329936837f1

Vicent Martí 2012-10-24T18:33:02

Merge pull request #1013 from ethomson/reset_merge reset changes for merge