[MERGE][BUG #185458] Switch NFKC=>NFC for normalization checks

[John Arbash Meinel]

The bug itself has more detail, but basically NFC is a better 
normalization to use. This changes the internals to use it, and adds a 
couple small test updates.

John
=:->
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: nfc.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20080128/6a3f991c/attachment.diff