Merge remote branch 'refs/remotes/origin/fruitiex/votesounds'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 11:41:21 +0000 (13:41 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 11:41:21 +0000 (13:41 +0200)

Trivial merge