Merged revisions 7776,7778 via svnmerge from

https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint

........
  r7776 | jdh2358 | 2009-09-17 13:06:02 -0400 (Thu, 17 Sep 2009) | 1 line
  
  add make.osx to manifest
........
  r7778 | leejjoon | 2009-09-17 17:42:03 -0400 (Thu, 17 Sep 2009) | 1 line
  
  fix the legend bug that dash-style for LineCollections handle is set incorrectly
........

svn path=/trunk/matplotlib/; revision=7779

Author: leejjoon

MANIFEST.in

@@ -1,6 +1,6 @@
 include CHANGELOG KNOWN_BUGS INSTALL
 include INTERACTIVE TODO
-include Makefile  MANIFEST.in MANIFEST
+include Makefile  make.osx MANIFEST.in MANIFEST
 include matplotlibrc.template setup.cfg.template
 include __init__.py setupext.py setup.py setupegg.py
 include examples/data/*

lib/matplotlib/legend.py

@@ -517,7 +517,8 @@ def _init_legend_box(self, handles, labels):
                 color = handle.get_colors()[0]
                 legline.set_color(color)
                 legline.set_linewidth(lw)
-                legline.set_dashes(dashes)
+                if dashes[0] is not None: # dashed line
+                    legline.set_dashes(dashes[1])
                 handle_list.append(legline)
 
             elif isinstance(handle, RegularPolyCollection):