Merge commit 'v2.6.39-rc2' into spi/merge
authorGrant Likely <grant.likely@secretlab.ca>
Thu, 7 Apr 2011 18:15:50 +0000 (11:15 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 7 Apr 2011 18:15:50 +0000 (11:15 -0700)

Trivial merge