merge from problem-list branch with a few cosmetic changes

git-svn-id: http://svn.mkgmap.org.uk/splitter/trunk@289 838fabe5-b1a8-4b81-9896-7a84386980e9