Merge branch 'upstream' into stable
authorIan Beckwith <ianb@erislabs.net>
Thu, 16 Dec 2010 23:17:50 +0000 (23:17 +0000)
committerIan Beckwith <ianb@erislabs.net>
Thu, 16 Dec 2010 23:17:50 +0000 (23:17 +0000)

Trivial merge