Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Fri, 6 Nov 2009 14:25:35 +0000 (15:25 +0100)
committerAndre Noll <maan@systemlinux.org>
Fri, 6 Nov 2009 14:25:35 +0000 (15:25 +0100)

Trivial merge