Merge commit 'crater/master'
authorSimon 'corecode' Schubert <corecode@fs.ei.tum.de>
Wed, 30 Sep 2009 15:05:55 +0000 (17:05 +0200)
committerSimon 'corecode' Schubert <corecode@fs.ei.tum.de>
Wed, 30 Sep 2009 15:05:55 +0000 (17:05 +0200)

Trivial merge