Merge remote branch 'origin/acid-burn/virtualkeyboard' into experimental
authorMladen Horvat <acid-burn@opendreambox.org>
Wed, 20 Apr 2011 09:32:01 +0000 (11:32 +0200)
committerMladen Horvat <acid-burn@opendreambox.org>
Wed, 20 Apr 2011 09:32:01 +0000 (11:32 +0200)

Trivial merge