Merge branch 'upstream' into stable
authorIan Beckwith <ianb@erislabs.net>
Sat, 23 Oct 2010 21:48:17 +0000 (22:48 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sat, 23 Oct 2010 21:48:17 +0000 (22:48 +0100)

Trivial merge