Merge branch 'master' into sim-target-tree
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Sat, 15 May 2010 19:58:08 +0000 (15 21:58 +0200)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Sat, 15 May 2010 19:58:08 +0000 (15 21:58 +0200)

Trivial merge