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

diff --cc CMakeLists.txt
Simple merge

diff --cc src/tools/CMakeLists.txt
index fbe24534bad5f64054da4d8be66ac19544e3f0e4,45edce51f5b43523cb0806b9a64016d88519ac19..998997b8d0b08eba2f65ead924f0c81265c2727f
--- 1/src/tools/CMakeLists.txt
--- 2/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@@ -28,10 -28,11 +28,11 @@@ add_library(gmxan
              gmx_trjconv.c   gmx_trjcat.c    gmx_trjorder.c  gmx_xpm2ps.c    
              gmx_editconf.c  gmx_genbox.c    gmx_genion.c    gmx_genconf.c   
              gmx_genpr.c     gmx_eneconv.c   gmx_vanhove.c   gmx_wheel.c     
-             addconf.c       calcpot.c       edittop.c       gmx_bar.c)
+             addconf.c       calcpot.c       edittop.c       gmx_bar.c
+             gmx_membed.c    )
  
  target_link_libraries(gmxana md ${GMX_EXTRA_LIBRARIES})
 -
 +set_target_properties(gmxana PROPERTIES OUTPUT_NAME "gmxana${GMX_BINARY_SUFFIX}")
  
  # List of programs with single corresponding .c source file,
  # used to create build rules automatically.