Rebase branch
authorMatthias Schmidt <gravatronics@live.com>
Tue, 16 Aug 2011 11:37:01 +0000 (13:37 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 16 Aug 2011 11:37:01 +0000 (13:37 +0200)

Trivial merge