Merge branch 'master' of git@git.gromacs.org:gromacs

diff --cc src/kernel/pdb2gmx.c
index 9df857a7895ae16590e580a4f56366a3524ede34,929f0466d707b3648738155d69cb129b2f90b474..26147bbbdcfcc3760cc88edd16c0b0e08c3c53e7
--- 1/src/kernel/pdb2gmx.c
--- 2/src/kernel/pdb2gmx.c
+++ b/src/kernel/pdb2gmx.c
@@@ -836,9 -835,9 +835,9 @@@ int main(int argc, char *argv[]
    t_aa_names *aan;
    const char *top_fn;
    char       fn[256],itp_fn[STRLEN],posre_fn[STRLEN],buf_fn[STRLEN];
 -  char       molname[STRLEN],title[STRLEN],quote[STRLEN];
 +  char       molname[STRLEN],title[STRLEN],quote[STRLEN],generator[STRLEN];
    char       *c,forcefield[STRLEN],ffdir[STRLEN];
-   char       fff[STRLEN],suffix[STRLEN];
+   char       ffname[STRLEN],suffix[STRLEN];
    const char *watres;
    int        nrtpf;
    char       **rtpf;

diff --cc src/kernel/pdb2top.c
Simple merge