Merge branch 'github/master'
authorDavid Herrmann <dh.herrmann@googlemail.com>
Tue, 23 Oct 2012 09:39:24 +0000 (11:39 +0200)
committerDavid Herrmann <dh.herrmann@googlemail.com>
Tue, 23 Oct 2012 09:39:24 +0000 (11:39 +0200)
Merge upstream development into the config-rework.


Trivial merge