Merge branch 'object-types'
Zachary Stevens [Tue, 17 Nov 2009 21:14:04 +0000 (21:14 +0000)]

Trivial merge