Merge branch 'ssalevan_delegation'

Conflicts:

	func.spec
	func/minion/modules/certmastermod.py
	setup.py

1 files changed, 1 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index 992992a..0c79130 100644
--- a/setup.py
+++ b/setup.py
@@ -34,8 +34,8 @@ if __name__ == "__main__":
                      "scripts/func-inventory",
                      "scripts/func-create-module",
 		     "scripts/func-transmit"
+		     "scripts/func-build-map"
                 ],
-		# package_data = { '' : ['*.*'] },
                 package_dir = {"%s" % NAME: "%s" % NAME
                 },
 		packages = ["%s" % NAME,