Merge remote-tracking branch 'refs/remotes/fml/master'
authorAndre Noll <maan@systemlinux.org>
Thu, 3 Mar 2011 18:43:25 +0000 (19:43 +0100)
committerAndre Noll <maan@systemlinux.org>
Thu, 3 Mar 2011 18:43:25 +0000 (19:43 +0100)

Trivial merge