Following up shapefile-ng swap
Merge pull request #204 from aaime/shapefile-ng

Following up shapefile-ng swap in GeoTools
Merge branch 'master' of git://github.com/geoserver/geoserver