Merge "Fix Clang 3.1 compile error"
authorSzilárd Páll <pszilard@cbr.su.se>
Fri, 25 May 2012 09:00:28 +0000 (11:00 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Fri, 25 May 2012 09:00:28 +0000 (11:00 +0200)

Trivial merge