Merge remote-tracking branch 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Tue, 29 Mar 2011 22:27:57 +0000 (00:27 +0200)
committerAndre Noll <maan@systemlinux.org>
Tue, 29 Mar 2011 22:27:57 +0000 (00:27 +0200)

Trivial merge