Merge remote-tracking branch 'gerrit/release-4-5-patches' into release-4-6
authorRoland Schulz <roland@utk.edu>
Tue, 3 Apr 2012 17:02:10 +0000 (13:02 -0400)
committerRoland Schulz <roland@utk.edu>
Tue, 3 Apr 2012 17:02:10 +0000 (13:02 -0400)
commit00042321aaf6d4a512ea22779120fb2e55dbf091
tree0efe03d787b30d8f3218cb19eff012be9def0e3f
parent041bdb82cd91f877ed4696d5f6c2b0501c54b3e9
parentab37de61397bbf7b0c54978e4f9770374cba20bf
Merge remote-tracking branch 'gerrit/release-4-5-patches' into release-4-6

Conflicts:
CMakeLists.txt

Change-Id: I67d65e260f68442841d8b901d77780b8d1505340
CMakeLists.txt
src/kernel/gen_ad.c
src/kernel/pdb2top.c
src/kernel/pgutil.c
src/tools/gmx_energy.c
src/tools/gmx_msd.c