Merge branch 'release-4-5-patches'

author David van der Spoel <spoel@xray.bmc.uu.se>

Tue, 14 Sep 2010 07:08:12 +0000 (09:08 +0200)

committer David van der Spoel <spoel@xray.bmc.uu.se>

Tue, 14 Sep 2010 07:08:12 +0000 (09:08 +0200)
author David van der Spoel <spoel@xray.bmc.uu.se>
Tue, 14 Sep 2010 07:08:12 +0000 (09:08 +0200)
committer David van der Spoel <spoel@xray.bmc.uu.se>
Tue, 14 Sep 2010 07:08:12 +0000 (09:08 +0200)
diff --cc src/kernel/CMakeLists.txt
Simple merge
diff --cc src/kernel/md.c
Simple merge
diff --cc src/mdlib/tpi.c
Simple merge
author	David van der Spoel <spoel@xray.bmc.uu.se>
	Tue, 14 Sep 2010 07:08:12 +0000 (09:08 +0200)
committer	David van der Spoel <spoel@xray.bmc.uu.se>
	Tue, 14 Sep 2010 07:08:12 +0000 (09:08 +0200)
		1	2
src/kernel/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/kernel/md.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mdlib/tpi.c	patch \|	diff1 \|	diff2 \|	blob \| history