Merge branch 'master' into for-next
authorNeil Brown <neilb@notabene.brown>
Tue, 8 Jul 2008 00:11:50 +0000 (10:11 +1000)
committerNeil Brown <neilb@notabene.brown>
Tue, 8 Jul 2008 00:11:50 +0000 (10:11 +1000)

Trivial merge