Merge "improve build with OpenMM, still not 100% fixed" into release-4-6
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 10 May 2013 11:53:04 +0000 (13:53 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Fri, 10 May 2013 11:53:04 +0000 (13:53 +0200)

Trivial merge