[MERGE] Restore patch verification, make it work on CR, CRLF files

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Bundle Buggy wrote:
> Bundle Buggy has detected this merge request.
> 
> For details, see:
> http://bundlebuggy.aaronbentley.com/request/%3C46C367A4.5040601%40utoronto.ca%3E

Repeated attempts to get this reviewed have not succeeded, so I'm
merging this unreviewed.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGztdg0F+nu1YWqI0RApkfAJ0QcQ2omwY63RTMOGa9+19NexwnKACfR2jf
hnm52kO8DyLcvOurr0Tr6L4=
=o7Aq
-----END PGP SIGNATURE-----