Merge branch 'upstream'
authorIan Beckwith <ianb@erislabs.net>
Tue, 12 Jul 2011 01:47:49 +0000 (02:47 +0100)
committerIan Beckwith <ianb@erislabs.net>
Tue, 12 Jul 2011 01:47:49 +0000 (02:47 +0100)

Trivial merge