Merge branch 'master' into for-linus
authorAlex Elder <aelder@sgi.com>
Thu, 8 Oct 2009 18:53:44 +0000 (13:53 -0500)
committerAlex Elder <aelder@sgi.com>
Thu, 8 Oct 2009 18:53:44 +0000 (13:53 -0500)

Trivial merge