Merge branch 'master' of github.com:matplotlib/basemap

Author: Jeff Whitaker

Changelog

@@ -1,4 +1,6 @@
 since version 1.0.2
+           * fix constant in Robinson projection (update PJ_robin.c
+             from proj4 svn).
            * fix typo in setup.py (replace "!= ['sdist','clean']" with
              "not in ['sdist','clean']").
            * make sure drawmeridians can handle wrap-around (so that

src/PJ_robin.c

@@ -35,7 +35,7 @@ Y[] = {
 0.31,	0.0124108,	3.73349e-06,	-1.1779e-06,
 0.372,	0.0123598,	-1.3935e-05,	4.39588e-06,
 0.434,	0.0125501,	5.20034e-05,	-1.00051e-05,
-0.4968,	0.0123198,	-9.80735e-05,	9.22397e-06,
+0.4958,	0.0123198,	-9.80735e-05,	9.22397e-06,
 0.5571,	0.0120308,	4.02857e-05,	-5.2901e-06,
 0.6176,	0.0120369,	-3.90662e-05,	7.36117e-07,
 0.6769,	0.0117015,	-2.80246e-05,	-8.54283e-07,