Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Sun, 31 May 2009 10:40:10 +0000 (12:40 +0200)
committerAndre Noll <maan@systemlinux.org>
Sun, 31 May 2009 10:40:10 +0000 (12:40 +0200)

Trivial merge