Merge branch 'upstream' into test
authorIan Beckwith <ianb@erislabs.net>
Fri, 17 Jun 2011 19:29:43 +0000 (20:29 +0100)
committerIan Beckwith <ianb@erislabs.net>
Fri, 17 Jun 2011 19:29:43 +0000 (20:29 +0100)

Trivial merge