pull https://github.com/radar/paranoia/pull/189 into rails3 branch