Merge "Cleaning up some bad coding practices" into release-4-6
authorRoland Schulz <roland@utk.edu>
Sun, 27 Nov 2011 21:48:50 +0000 (22:48 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Sun, 27 Nov 2011 21:48:50 +0000 (22:48 +0100)

Trivial merge