Merge branch 'v2.6.35'
authorAlex Elder <aelder@sgi.com>
Mon, 2 Aug 2010 15:24:57 +0000 (10:24 -0500)
committerAlex Elder <aelder@sgi.com>
Mon, 2 Aug 2010 15:24:57 +0000 (10:24 -0500)

Trivial merge