ryanb/cancan — pull request #686 by andhapp (2012-07-12 13:46:10+00:00)
Title: Fix pull request 657

Just rebased against master to ensure pull request #657 merges cleanly.