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)
commitb6336ca2982ccac98d9d017426c53ff1e13c017f
tree26d7c5b1999cab1db6d2178d37a366a10a22ba7f
parenta80fd9db0e1909a03e5d5a29e2e73001e38d12f5
parent59c5f46fbe01a00eedf54a23789634438bb80603
Merge remote-tracking branch 'origin' into spi/merge