From: Christian Lamparter <chunkeey@googlemail.com>
Date: Thu, 13 Sep 2012 22:29:46 +0000 (+0200)
Subject: Merge branch 'master' into radar
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=d7eb06db9a6f2a82ae3aacc8e01faacc53b370d9;hp=d7eb06db9a6f2a82ae3aacc8e01faacc53b370d9;p=carl9170fw.git

Merge branch 'master' into radar

Conflicts:
	tools/src/CMakeLists.txt
---