[MERGE] UTF-8 encoding in binary diffs

[Aaron Bentley]

Aaron Bentley has voted +1.
Status is now: Semi-approved
Comment:
Looks okay to me.  Will probably conflict with "Re: [MERGE][Take Five] 
Show the diff in the commit messages".

I don't especially like "fd" since it's not a file descriptor, but 
you're right that you only need to close it in the else clause.

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3Cd06a5cd30707260059r7249c2d4l7c41e691f89383ff%40mail.gmail.com%3E