Merge commit 'v3.1' into spi/next
authorGrant Likely <grant.likely@secretlab.ca>
Mon, 24 Oct 2011 11:42:08 +0000 (13:42 +0200)
committerGrant Likely <grant.likely@secretlab.ca>
Mon, 24 Oct 2011 11:42:08 +0000 (13:42 +0200)

Trivial merge