Merge remote branch 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 7 Jun 2010 08:16:41 +0000 (10:16 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 7 Jun 2010 08:16:41 +0000 (10:16 +0200)

Trivial merge