SVN revision: 76768
need to fix the city stuff in tests and the benchmark with the e17 data (need help with make rules :) SVN revision: 76712