Merge branch 'fallback_font'
authorSven Donath <lxo@dexo.de>
Wed, 22 Feb 2012 12:45:40 +0000 (13:45 +0100)
committerSven Donath <lxo@dexo.de>
Wed, 22 Feb 2012 12:45:40 +0000 (13:45 +0100)

Trivial merge