Merge branch 'upstream'
authorIan Beckwith <ianb@erislabs.net>
Mon, 7 Sep 2009 23:17:35 +0000 (00:17 +0100)
committerIan Beckwith <ianb@erislabs.net>
Mon, 7 Sep 2009 23:17:35 +0000 (00:17 +0100)

Trivial merge