Merge "fixed nbnxn no LJ comb.rule AVX256 PME kernel" into release-4-6
authorErik Lindahl <erik@kth.se>
Fri, 11 Jan 2013 11:39:56 +0000 (12:39 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Fri, 11 Jan 2013 11:39:56 +0000 (12:39 +0100)

Trivial merge