Summary of changes:
c26c41b... updating txconfig for f18 branch (*)
e34f830... Changing xml to work around apparent publican bug (#876506) (*)
d41deb0... Removed <trademark> tags to keep with style guide (*)
5265518... fixing more xml for translators (*)
bd0f301... updating FedUp walkthrough (*)
6250e56... adding a note about fedup plymouth theme - manual appending (*)
01fde75... Pull and Merge: Resolve conflict from f18 branch
009d2db... Merge branch 'master' of
ssh://git.fedorahosted.org/git/doc
(*) This commit already existed in another branch; no separate mail sent