Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 28 Sep 2009 15:44:06 +0000 (17:44 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 28 Sep 2009 15:44:06 +0000 (17:44 +0200)

Trivial merge