Merge changes Ibc555d88,Iaf6f3051 into release-4-6
authorRoland Schulz <roland@utk.edu>
Mon, 19 Nov 2012 21:30:52 +0000 (22:30 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Mon, 19 Nov 2012 21:30:52 +0000 (22:30 +0100)
* changes:
  Fix GMX_TEST_CFLAG bug with acceleration flags
  Fix bugs in gmxCFlags


Trivial merge