Merge remote-tracking branch 'alfh/bugfix_menu_touch' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Feb 2014 19:47:54 +0000 (20:47 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 19 Feb 2014 19:47:54 +0000 (20:47 +0100)

Trivial merge