Merge branch 'master' into for-linus
authorAlex Elder <aelder@sgi.com>
Wed, 19 May 2010 14:59:23 +0000 (09:59 -0500)
committerAlex Elder <aelder@sgi.com>
Wed, 19 May 2010 14:59:23 +0000 (09:59 -0500)

Trivial merge