Merge remote branch 'refs/remotes/meins/master'
authorAndre Noll <maan@systemlinux.org>
Thu, 3 Feb 2011 08:46:23 +0000 (09:46 +0100)
committerAndre Noll <maan@systemlinux.org>
Thu, 3 Feb 2011 08:46:23 +0000 (09:46 +0100)

Trivial merge