Merge remote branch 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Thu, 13 May 2010 18:13:02 +0000 (20:13 +0200)
committerAndre Noll <maan@systemlinux.org>
Thu, 13 May 2010 18:13:02 +0000 (20:13 +0200)

Trivial merge