Merge branch 'upstream'
authorIan Beckwith <ianb@erislabs.net>
Tue, 15 Sep 2009 22:25:30 +0000 (23:25 +0100)
committerIan Beckwith <ianb@erislabs.net>
Tue, 15 Sep 2009 22:25:30 +0000 (23:25 +0100)

Trivial merge