Merge branch 'v2.6.36'
authorAlex Elder <aelder@sgi.com>
Thu, 21 Oct 2010 13:29:34 +0000 (08:29 -0500)
committerAlex Elder <aelder@sgi.com>
Thu, 21 Oct 2010 13:29:34 +0000 (08:29 -0500)

Trivial merge