Merge branch 'master' into next
James Morris [Mon, 29 Jun 2009 23:10:35 +0000 (09:10 +1000)]

Trivial merge