Merge branch 'renames-for-release'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Sat, 28 Jul 2012 16:15:12 +0000 (18:15 +0200)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Sat, 28 Jul 2012 16:15:12 +0000 (18:15 +0200)

Trivial merge