Merged with mainline

author Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>

Mon, 9 Nov 2009 20:58:49 +0000 (21:58 +0100)

committer Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>

Mon, 9 Nov 2009 20:58:49 +0000 (21:58 +0100)
author Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Mon, 9 Nov 2009 20:58:49 +0000 (21:58 +0100)
committer Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Mon, 9 Nov 2009 20:58:49 +0000 (21:58 +0100)
diff --cc ChangeLog
Simple merge
diff --cc conf/common.rmk
Simple merge
diff --cc conf/i386-pc.rmk
Simple merge
author	Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
	Mon, 9 Nov 2009 20:58:49 +0000 (21:58 +0100)
committer	Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
	Mon, 9 Nov 2009 20:58:49 +0000 (21:58 +0100)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
conf/common.rmk	patch \|	diff1 \|	diff2 \|	blob \| history
conf/i386-pc.rmk	patch \|	diff1 \|	diff2 \|	blob \| history