Merge branch 'master' of github.com:mapnik/mapnik
fixup various plugin includes
clean up unused code and includes
ensure simple invalid inputs to wkb do not crash - closes #1333
add test for #997- closes #997
amend 516f7c7 to suport filtering on collections and rename line to linestring for consistency - refs #546
update changelog with geometry filter support as per #546
add test map for colorize-alpha comp-op
collect attribute descriptions in geojson plugin (TODO: sorting of attributes is returned in reverse order)
unmask failing test - refs #1345
add a geometry collection to csv wkt test
add render target
load_map: a stroke-width=0 is valid for markers now (for restyling svg)
no need anymore to have parse_stroke return a bool
make stock ellipse a true ellipse
+ turns off white space skipping
+ use std::auto_ptr
+ use pre-increment op
+ fix SEG_CLOSE value to be compatible with agg
+ close polygon