Merge "Fixes linkage with FFTW + MKL for BLAS/LAPACK" into release-4-6
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 11 Mar 2013 11:10:49 +0000 (12:10 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Mon, 11 Mar 2013 11:10:49 +0000 (12:10 +0100)

Trivial merge