Merge branch 'master' into gsoc-app-target
authorThomas Martitz <thomas.martitz@student.htw-berlin.de>
Tue, 22 Jun 2010 23:23:01 +0000 (23 01:23 +0200)
committerThomas Martitz <thomas.martitz@student.htw-berlin.de>
Tue, 22 Jun 2010 23:23:01 +0000 (23 01:23 +0200)

Trivial merge