Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Mon, 20 Jul 2009 16:54:49 +0000 (18:54 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 20 Jul 2009 16:54:49 +0000 (18:54 +0200)

Trivial merge