Merge branch 'vm'

author Richard P. Curnow <rc@rc0.org.uk>

Tue, 26 Jun 2007 21:13:40 +0000 (22:13 +0100)

committer Richard P. Curnow <rc@rc0.org.uk>

Tue, 26 Jun 2007 21:13:40 +0000 (22:13 +0100)
author Richard P. Curnow <rc@rc0.org.uk>
Tue, 26 Jun 2007 21:13:40 +0000 (22:13 +0100)
committer Richard P. Curnow <rc@rc0.org.uk>
Tue, 26 Jun 2007 21:13:40 +0000 (22:13 +0100)
diff --cc configure
Simple merge
diff --cc io_linux.h
Simple merge
author	Richard P. Curnow <rc@rc0.org.uk>
	Tue, 26 Jun 2007 21:13:40 +0000 (22:13 +0100)
committer	Richard P. Curnow <rc@rc0.org.uk>
	Tue, 26 Jun 2007 21:13:40 +0000 (22:13 +0100)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
io_linux.h	patch \|	diff1 \|	diff2 \|	blob \| history