Merge commit 'upstream/0.14.01'
authorIan Beckwith <ianb@erislabs.net>
Thu, 26 Feb 2009 03:12:58 +0000 (03:12 +0000)
committerIan Beckwith <ianb@erislabs.net>
Thu, 26 Feb 2009 03:12:58 +0000 (03:12 +0000)

Trivial merge