Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Mon, 9 Nov 2009 17:31:25 +0000 (18:31 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 9 Nov 2009 17:31:25 +0000 (18:31 +0100)

Trivial merge