Merge commit 'meins/maint' into maint
authorAndre Noll <maan@systemlinux.org>
Fri, 23 Oct 2009 08:38:17 +0000 (10:38 +0200)
committerAndre Noll <maan@systemlinux.org>
Fri, 23 Oct 2009 08:38:17 +0000 (10:38 +0200)

Trivial merge