Fix -Wshadow warning
scons: back off using -Wshadow since this triggers too much spurious noise with g++-4.7 and clang++/libc++
Merge branch '2.3.x' of github.com:mapnik/mapnik