Merge branch 'v1.1.x'

leejjoon · leejjoon · commit b3a2ab77c89f · 2011-11-28T23:48:56.000+09:00
Conflicts:
	lib/matplotlib/text.py
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)
