merge from mergeroads branch to prepare for new frigRoundabouts method

git-svn-id: http://svn.mkgmap.org.uk/mkgmap/trunk@2794 25d90789-57f7-4ee0-8453-03a3dfeeeb22