Merge branch 'upstream'
authorIan Beckwith <ianb@erislabs.net>
Mon, 24 Mar 2008 18:22:00 +0000 (18:22 +0000)
committerIan Beckwith <ianb@erislabs.net>
Mon, 24 Mar 2008 18:22:00 +0000 (18:22 +0000)

Trivial merge