Merge branch 'v1.2.x' of github.com:matplotlib/matplotlib into v1.2.x

Author: mdboom

lib/matplotlib/axes.py

@@ -1120,7 +1120,7 @@ def set_anchor(self, anchor):
             self._anchor = anchor
         else:
             raise ValueError('argument must be among %s' %
-                                ', '.join(mtransforms.BBox.coefs.keys()))
+                                ', '.join(mtransforms.Bbox.coefs.keys()))
 
     def get_data_ratio(self):
         """