Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Sat, 24 Oct 2009 19:24:56 +0000 (21:24 +0200)
committerAndre Noll <maan@systemlinux.org>
Sat, 24 Oct 2009 19:24:56 +0000 (21:24 +0200)

Trivial merge