Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Thu, 12 Nov 2009 21:12:46 +0000 (22:12 +0100)
committerAndre Noll <maan@systemlinux.org>
Thu, 12 Nov 2009 21:12:46 +0000 (22:12 +0100)

Trivial merge