Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Thu, 18 Mar 2010 08:43:19 +0000 (09:43 +0100)
committerAndre Noll <maan@systemlinux.org>
Thu, 18 Mar 2010 08:43:19 +0000 (09:43 +0100)

Trivial merge