Merge remote-tracking branch 'origin/acid-burn/virtualkeyboard'
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 6 Sep 2011 13:20:16 +0000 (15:20 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 6 Sep 2011 13:20:16 +0000 (15:20 +0200)

Trivial merge