Merge remote branch 'origin' into secretlab/next-spi
authorGrant Likely <grant.likely@secretlab.ca>
Tue, 25 May 2010 06:38:26 +0000 (00:38 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Tue, 25 May 2010 06:38:26 +0000 (00:38 -0600)

Trivial merge