Merge branch 'keymaps'
authorSebastian Pipping <sebastian@pipping.org>
Mon, 9 Apr 2012 02:43:50 +0000 (04:43 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Mon, 9 Apr 2012 02:43:56 +0000 (04:43 +0200)
Acked-by: Rick Farina <sidhayn@gmail.com>

Trivial merge