Merge with 18a2d5e39e06e0f30c1da8af5dae231d52f0e02e

author johan <devnull@localhost>

Fri, 11 Feb 2011 19:07:08 +0000 (20:07 +0100)

committer johan <devnull@localhost>

Fri, 11 Feb 2011 19:07:08 +0000 (20:07 +0100)
author johan <devnull@localhost>
Fri, 11 Feb 2011 19:07:08 +0000 (20:07 +0100)
committer johan <devnull@localhost>
Fri, 11 Feb 2011 19:07:08 +0000 (20:07 +0100)
diff --cc boards/generic/EcuM_Callout_template.c
Simple merge
diff --cc boards/generic/EcuM_Cfg.c
Simple merge
diff --cc boards/generic/EcuM_Generated_Types.h
Simple merge
author	johan <devnull@localhost>
	Fri, 11 Feb 2011 19:07:08 +0000 (20:07 +0100)
committer	johan <devnull@localhost>
	Fri, 11 Feb 2011 19:07:08 +0000 (20:07 +0100)
		1	2
boards/generic/EcuM_Callout_template.c	patch \|	diff1 \|	diff2 \|	blob \| history
boards/generic/EcuM_Cfg.c	patch \|	diff1 \|	diff2 \|	blob \| history
boards/generic/EcuM_Generated_Types.h	patch \|	diff1 \|	diff2 \|	blob \| history