Merge branch 'master' into model-reorg
Zachary Stevens [Sat, 7 Nov 2009 19:12:00 +0000 (19:12 +0000)]

Trivial merge