Merge release-4-6 into master
authorRoland Schulz <roland@utk.edu>
Wed, 13 Feb 2013 21:05:55 +0000 (16:05 -0500)
committerRoland Schulz <roland@utk.edu>
Wed, 13 Feb 2013 21:08:11 +0000 (16:08 -0500)
commite0f3377d569bbc17df229fb2c561847ef33a2741
tree0c58bbf277ecba007ade5ee228cd7d05b5580dce
parent0c77aae90fbf9e0528d017cae45179a9a9982acf
parent125487e3b8e1b081506c1096dd98976ee90c6975
Merge release-4-6 into master

Conflicts:
cmake/Findgsl.cmake (deleted)
src/gromacs/legacyheaders/pme.h (manually removed export)
src/gromacs/mdlib/pme_pp.c (trivial)

Change-Id: I716f58e9dbb2c4a4c81993475ea6a98a0d0ba440
CMakeLists.txt
src/gromacs/gmxlib/thread_mpi/pthreads.c
src/gromacs/legacyheaders/pme.h
src/gromacs/mdlib/pme.c
src/gromacs/mdlib/pme_pp.c
src/gromacs/mdlib/update.c
src/programs/mdrun/md.c
src/programs/mdrun/pme_loadbal.c