Merge with 611be225e1cd9a5cf482f394a0e53d3983ecb394

author jcar <devnull@localhost>

Mon, 24 May 2010 12:08:04 +0000 (14:08 +0200)

committer jcar <devnull@localhost>

Mon, 24 May 2010 12:08:04 +0000 (14:08 +0200)
author jcar <devnull@localhost>
Mon, 24 May 2010 12:08:04 +0000 (14:08 +0200)
committer jcar <devnull@localhost>
Mon, 24 May 2010 12:08:04 +0000 (14:08 +0200)
diff --cc boards/board_common.mk
Simple merge
diff --cc makefile
Simple merge
author	jcar <devnull@localhost>
	Mon, 24 May 2010 12:08:04 +0000 (14:08 +0200)
committer	jcar <devnull@localhost>
	Mon, 24 May 2010 12:08:04 +0000 (14:08 +0200)
		1	2
boards/board_common.mk	patch \|	diff1 \|	diff2 \|	blob \| history
makefile	patch \|	diff1 \|	diff2 \|	blob \| history