Merge branch 'upstream' into stable
authorIan Beckwith <ianb@erislabs.net>
Fri, 11 Feb 2011 03:09:19 +0000 (03:09 +0000)
committerIan Beckwith <ianb@erislabs.net>
Fri, 11 Feb 2011 03:09:19 +0000 (03:09 +0000)

Trivial merge