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

Trivial merge