Merge branch 'fallback_font'
authorSven Donath <lxo@dexo.de>
Thu, 23 Feb 2012 12:58:30 +0000 (13:58 +0100)
committerSven Donath <lxo@dexo.de>
Thu, 23 Feb 2012 12:58:30 +0000 (13:58 +0100)

Trivial merge