Merge "Fix build of template and other external code." into release-4-6
authorRoland Schulz <roland@rschulz.eu>
Sun, 9 Dec 2012 00:59:53 +0000 (01:59 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Sun, 9 Dec 2012 00:59:53 +0000 (01:59 +0100)

Trivial merge