Merge "Fix ICC on Windows Build" into release-4-5-patches
authorDavid van der Spoel <davidvanderspoel@gmail.com>
Tue, 31 Jan 2012 18:38:42 +0000 (19:38 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Tue, 31 Jan 2012 18:38:42 +0000 (19:38 +0100)

Trivial merge