Merge branch 'develop' into mplegendre-multi_pkgsrc_roots

Conflicts:
	lib/spack/spack/cmd/create.py
	lib/spack/spack/cmd/extensions.py
	lib/spack/spack/cmd/fetch.py
	lib/spack/spack/cmd/uninstall.py
	lib/spack/spack/config.py
	lib/spack/spack/database.py
	lib/spack/spack/directory_layout.py
	lib/spack/spack/packages.py
	lib/spack/spack/spec.py

var/spack/repos/builtin/packages/damselfly/package.py

@@ -0,0 +1,14 @@
+from spack import *
+
+class Damselfly(Package):
+    """Damselfly is a model-based parallel network simulator."""
+    homepage = "https://github.com/llnl/damselfly"
+    url      = "https://github.com/llnl/damselfly"
+
+    version('1.0', '05cf7e2d8ece4408c0f2abb7ab63fd74c0d62895', git='https://github.com/llnl/damselfly.git', tag='v1.0')
+
+    def install(self, spec, prefix):
+        with working_dir('spack-build', create=True):
+	    cmake('-DCMAKE_BUILD_TYPE=release', '..', *std_cmake_args)
+	    make()
+	    make('install')