Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Sun, 3 Nov 2013 11:53:53 +0000 (12:53 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 3 Nov 2013 11:53:53 +0000 (12:53 +0100)

Trivial merge