Merge branch 'master' into radar

author Christian Lamparter <chunkeey@googlemail.com>

Sat, 26 Jan 2013 20:46:51 +0000 (21:46 +0100)

committer Christian Lamparter <chunkeey@googlemail.com>

Sat, 26 Jan 2013 20:46:51 +0000 (21:46 +0100)
author Christian Lamparter <chunkeey@googlemail.com>
Sat, 26 Jan 2013 20:46:51 +0000 (21:46 +0100)
committer Christian Lamparter <chunkeey@googlemail.com>
Sat, 26 Jan 2013 20:46:51 +0000 (21:46 +0100)
diff --cc autogen.sh
Simple merge
diff --cc carlfw/Kconfig
Simple merge
diff --cc carlfw/src/main.c
Simple merge
author	Christian Lamparter <chunkeey@googlemail.com>
	Sat, 26 Jan 2013 20:46:51 +0000 (21:46 +0100)
committer	Christian Lamparter <chunkeey@googlemail.com>
	Sat, 26 Jan 2013 20:46:51 +0000 (21:46 +0100)
		1	2
autogen.sh	patch \|	diff1 \|	diff2 \|	blob \| history
carlfw/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
carlfw/src/main.c	patch \|	diff1 \|	diff2 \|	blob \| history