Merge commit 'upstream/0.15'
authorIan Beckwith <ianb@erislabs.net>
Sun, 22 Nov 2009 00:06:14 +0000 (00:06 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sun, 22 Nov 2009 00:06:14 +0000 (00:06 +0000)

Trivial merge