Merge "Hid nbnxn kernel names behind a lookup function" into release-4-6
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 15 Jan 2013 18:53:29 +0000 (19:53 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Tue, 15 Jan 2013 18:53:29 +0000 (19:53 +0100)

Trivial merge