Merge remote-tracking branch 'origin' into spi/merge
authorGrant Likely <grant.likely@secretlab.ca>
Wed, 8 Jun 2011 20:37:22 +0000 (14:37 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Wed, 8 Jun 2011 20:37:22 +0000 (14:37 -0600)

Trivial merge