Merge remote-tracking branch 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Wed, 16 Mar 2011 19:28:29 +0000 (20:28 +0100)
committerAndre Noll <maan@systemlinux.org>
Wed, 16 Mar 2011 19:28:29 +0000 (20:28 +0100)

Trivial merge