Merge branch 'v1.1.x'

Conflicts: lib/matplotlib/text.py
matplotlib · Nov 28, 2011 · b3a2ab7 · b3a2ab7
2 parents 15b0e60 + 0cfea91
commit b3a2ab7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -1795,7 +1795,7 @@ def __init__(self, s, xy,
         self.arrow = None
 
         if arrowprops and "arrowstyle" in arrowprops:
-
+            arrowprops = self.arrowprops.copy()
             self._arrow_relpos = arrowprops.pop("relpos", (0.5, 0.5))
             self.arrow_patch = FancyArrowPatch((0, 0), (1,1),
                                                **arrowprops)