Merge branch 'upstream' from 3f08220c1a263dfc45f6e0ce6dcee97631dd5e56
authorIan Beckwith <ianb@erislabs.net>
Sun, 29 Aug 2010 01:48:54 +0000 (02:48 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sun, 29 Aug 2010 01:48:54 +0000 (02:48 +0100)
 into stable (upstream as of aug 17)


Trivial merge