Merge branch 'rename-user'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Mon, 24 Jan 2011 08:56:41 +0000 (09:56 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Mon, 24 Jan 2011 08:56:41 +0000 (09:56 +0100)

Trivial merge