Merge branch 'release-4-5-patches'
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Wed, 25 Aug 2010 12:13:21 +0000 (14:13 +0200)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Wed, 25 Aug 2010 12:13:21 +0000 (14:13 +0200)
commit56968b5103f12a6a37a4c255bd0934bc4c080ce8
treeadd071661c39f350a058e4d7c4692781b5c690c1
parent5e3473a12e722b233f30e469f6747f2eee73429a
parent68e33a8d06f0ee333a9548c2ad96cd4f3b9023d2
Merge branch 'release-4-5-patches'

Conflicts:
include/resall.h
include/string2.h
include/thread_mpi/atomic/xlc_ppc.h
include/vec.h
src/kernel/pdb2top.c
include/resall.h
include/string2.h
include/thread_mpi/atomic/xlc_ppc.h
include/vec.h
src/kernel/pdb2top.c