ryanb/cancan — pull request #658 by andhapp (2012-06-19 22:08:58+00:00)
Title: Fix for pull request 528 (and 524)

Pull request 528 and 524 did not apply cleanly to master. This pull request takes the fix in #528 and rebases it against current master.