Merge branch 'master' into model-reorg
Zachary Stevens [Thu, 12 Nov 2009 14:08:04 +0000 (14:08 +0000)]

Trivial merge