Merge changes If0c2f9d9,Ic2a8ad82 into release-4-5-patches
authorSzilárd Páll <pszilard@cbr.su.se>
Sat, 11 Feb 2012 16:45:25 +0000 (17:45 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Sat, 11 Feb 2012 16:45:25 +0000 (17:45 +0100)
* changes:
  Fixed g_sham using more than three dimensions
  Integer multiplication that checks for overflow


Trivial merge