Merge branch 'xss-fix'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Thu, 22 Jul 2010 15:16:56 +0000 (17:16 +0200)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Thu, 22 Jul 2010 15:16:56 +0000 (17:16 +0200)

Trivial merge