Merge remote branch 'origin/update-522'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Tue, 15 Dec 2009 20:14:35 +0000 (21:14 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Tue, 15 Dec 2009 20:14:35 +0000 (21:14 +0100)

Trivial merge