Merge commit 'meins/maint' into maint
authorAndre Noll <maan@systemlinux.org>
Mon, 9 Nov 2009 17:30:26 +0000 (18:30 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 9 Nov 2009 17:30:26 +0000 (18:30 +0100)

Trivial merge