Merge branch 'master' into topic/strict_export_list
Dave Rolsky [Mon, 7 Sep 2009 17:01:57 +0000 (12:01 -0500)]
Conflicts:
t/010_basics/022_moose_exporter_groups.t


Trivial merge