Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 21 Dec 2009 10:45:02 +0000 (11:45 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 21 Dec 2009 10:45:02 +0000 (11:45 +0100)

Trivial merge