xadd more cairo test files, replace existing via ubuntu saucy
Merge branch '2.3.x' of github.com:mapnik/mapnik into 2.3.x