Merge commit 'v2.6.35-rc6' into spi/test
authorGrant Likely <grant.likely@secretlab.ca>
Sun, 25 Jul 2010 23:52:21 +0000 (17:52 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Sun, 25 Jul 2010 23:52:21 +0000 (17:52 -0600)

Trivial merge