Added matt's patch to fix username and fixed some tags where the attributes were wrong.
Added matt's patch to fix username and fixed some tags where the attributes were wrong.


git-svn-id: 88158f914d5603334254b4adf21dfd50ec107162@107690 13f79535-47bb-0310-9956-ffa450edef68

chibenwa/james,aduprat/james,chibenwa/james,aduprat/james,rouazana/james,aduprat/james,chibenwa/james,aduprat/james,rouazana/james,rouazana/james,chibenwa/james,rouazana/james