Related to #282
Closes #1097

Old: `<tag content="Human Readable Text">internal-id</tag>`
New: `<tag key="internal-id">Human Readable Text</tag>`

Fixes #826
Fixes #1095

Fixes #2

svn path=/trunk/; revision=30101

svn path=/trunk/; revision=23948

svn path=/trunk/; revision=23945

svn path=/trunk/; revision=23944

svn path=/trunk/; revision=23943

svn path=/trunk/; revision=23940

svn path=/trunk/; revision=23920

svn path=/trunk/; revision=23919

svn path=/trunk/; revision=23918

svn path=/trunk/; revision=23917

svn path=/trunk/; revision=23916

svn path=/trunk/; revision=23915

svn path=/trunk/; revision=23914

svn path=/trunk/; revision=23913