Merge commit 'upstream/0.16'
authorIan Beckwith <ianb@erislabs.net>
Sun, 20 Mar 2011 22:49:59 +0000 (22:49 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sun, 20 Mar 2011 22:49:59 +0000 (22:49 +0000)

Trivial merge