Merge branch 'cyrus-duplicates'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 20 Jul 2011 12:22:33 +0000 (14:22 +0200)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 20 Jul 2011 12:22:33 +0000 (14:22 +0200)

Trivial merge