Todd Gamblin 0c94a6e2b0 Merge branch 'features/python-modules' into features/memaxes ... Conflicts: var/spack/packages/qt/package.py		2015-02-12 10:01:58 -08:00
..
spack	Merge branch 'features/python-modules' into features/memaxes	2015-02-12 10:01:58 -08:00