Merge branch 'master' into topic/exporter_init_meta
Dave Rolsky [Mon, 7 Sep 2009 15:42:47 +0000 (10:42 -0500)]

Trivial merge