Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 9 Feb 2009 19:37:04 +0000 (20:37 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 9 Feb 2009 19:37:04 +0000 (20:37 +0100)

Trivial merge