Merge commit 'meins/maint' into maint
authorAndre Noll <maan@systemlinux.org>
Fri, 6 Nov 2009 14:19:32 +0000 (15:19 +0100)
committerAndre Noll <maan@systemlinux.org>
Fri, 6 Nov 2009 14:19:32 +0000 (15:19 +0100)

Trivial merge