Merge branch 'upstream'
authorIan Beckwith <ianb@erislabs.net>
Sun, 6 Sep 2009 23:33:11 +0000 (00:33 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sun, 6 Sep 2009 23:33:11 +0000 (00:33 +0100)

Trivial merge