Merge remote branch 'origin/acid-burn/virtualkeyboard' into experimental
authorMladen Horvat <acid-burn@opendreambox.org>
Tue, 19 Apr 2011 14:46:29 +0000 (16:46 +0200)
committerMladen Horvat <acid-burn@opendreambox.org>
Tue, 19 Apr 2011 14:46:29 +0000 (16:46 +0200)

Trivial merge