Specify the real values we want for attributes, without extra escaping; the XML API will escape whatever needs escaping
Merge pull request #14 from JonSkeetGoogle/XFRM-188

Specify the real values we want for attributes, without extra escaping.
Merge branch 'master' into XFRM-189
More whitespace fix