Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Thu, 28 May 2009 09:19:25 +0000 (11:19 +0200)
committerAndre Noll <maan@systemlinux.org>
Thu, 28 May 2009 09:19:25 +0000 (11:19 +0200)

Trivial merge