Merge mainline into sparc-mkimage

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

Sun, 14 Mar 2010 14:21:04 +0000 (15:21 +0100)

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

Sun, 14 Mar 2010 14:21:04 +0000 (15:21 +0100)
author Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 14 Mar 2010 14:21:04 +0000 (15:21 +0100)
committer Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 14 Mar 2010 14:21:04 +0000 (15:21 +0100)
diff --cc configure.ac
Simple merge
diff --cc kern/main.c
Simple merge
author	Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
	Sun, 14 Mar 2010 14:21:04 +0000 (15:21 +0100)
committer	Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
	Sun, 14 Mar 2010 14:21:04 +0000 (15:21 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
kern/main.c	patch \|	diff1 \|	diff2 \|	blob \| history