Merge branch 'upstream'
authorIan Beckwith <ianb@erislabs.net>
Sat, 5 Sep 2009 20:54:40 +0000 (21:54 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sat, 5 Sep 2009 20:54:40 +0000 (21:54 +0100)

Trivial merge