Merge branch 'master' into gsoc-app-target
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Mon, 28 Jun 2010 16:23:09 +0000 (28 18:23 +0200)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Mon, 28 Jun 2010 16:23:09 +0000 (28 18:23 +0200)
1  2 
firmware/export/config.h
tools/configure

Simple merge
diff --cc tools/configure
Simple merge