Merge "Illegal acceleration defaulted to QPX" into release-4-6
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 22 Jan 2013 18:17:52 +0000 (19:17 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Tue, 22 Jan 2013 18:17:52 +0000 (19:17 +0100)

Trivial merge