Merge branch 'upstream' (9.0.300)
authorIan Beckwith <ianb@erislabs.net>
Sun, 10 Jul 2011 14:14:02 +0000 (15:14 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sun, 10 Jul 2011 14:14:02 +0000 (15:14 +0100)

Trivial merge