Merge branch 'table_resolver'

git-svn-id: https://liblouis.googlecode.com/svn/trunk@1104 24698d54-e344-0410-af24-25bd253c2c7b
Fixup latest merge