Merged in from hcs12x branch

author joek <devnull@localhost>

Thu, 25 Nov 2010 14:16:19 +0000 (15:16 +0100)

committer joek <devnull@localhost>

Thu, 25 Nov 2010 14:16:19 +0000 (15:16 +0100)
author joek <devnull@localhost>
Thu, 25 Nov 2010 14:16:19 +0000 (15:16 +0100)
committer joek <devnull@localhost>
Thu, 25 Nov 2010 14:16:19 +0000 (15:16 +0100)
diff --cc boards/board_common.mk
Simple merge
diff --cc scripts/rules.mk
Simple merge
author	joek <devnull@localhost>
	Thu, 25 Nov 2010 14:16:19 +0000 (15:16 +0100)
committer	joek <devnull@localhost>
	Thu, 25 Nov 2010 14:16:19 +0000 (15:16 +0100)
		1	2
boards/board_common.mk	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/rules.mk	patch \|	diff1 \|	diff2 \|	blob \| history