Merge branch 'upstream' into ckermit-212-beta
authorIan Beckwith <ianb@erislabs.net>
Thu, 23 Jun 2011 23:57:35 +0000 (00:57 +0100)
committerIan Beckwith <ianb@erislabs.net>
Thu, 23 Jun 2011 23:57:35 +0000 (00:57 +0100)

Trivial merge