Merge branch 'spi/merge' into spi/next
authorGrant Likely <grant.likely@secretlab.ca>
Fri, 17 Jun 2011 14:32:26 +0000 (08:32 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Fri, 17 Jun 2011 14:32:26 +0000 (08:32 -0600)

Trivial merge