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/rsync/package.py

@@ -0,0 +1,15 @@
+from spack import *
+
+class Rsync(Package):
+    """rsync is an open source utility that provides fast incremental file transfer."""
+    homepage = "https://rsync.samba.org"
+    url      = "https://download.samba.org/pub/rsync/rsync-3.1.1.tar.gz"
+
+    version('3.1.2', '0f758d7e000c0f7f7d3792610fad70cb')
+    version('3.1.1', '43bd6676f0b404326eee2d63be3cdcfe')
+
+    def install(self, spec, prefix):
+        configure('--prefix=%s' % prefix)
+
+        make()
+        make("install")