Index: workshop2010/branches/uli-experimental/setup.py
===================================================================
--- workshop2010/branches/uli-experimental/setup.py	(revision 5546)
+++ workshop2010/branches/uli-experimental/setup.py	(revision 5547)
@@ -60,4 +60,5 @@
       [console_scripts]
       do_something = grokworkshop.samplemodule:do_something
+      merge_csv = grokworkshop.mergecsv:merge_csv_files
       """,
       )
