Merge branch 'master' into for-linus
authorAlex Elder <aelder@sgi.com>
Fri, 4 Jun 2010 18:22:30 +0000 (13:22 -0500)
committerAlex Elder <aelder@sgi.com>
Fri, 4 Jun 2010 18:22:30 +0000 (13:22 -0500)

Trivial merge