Merge from trunk to moose-exporter branch
Dave Rolsky [Mon, 11 Aug 2008 20:18:03 +0000 (20:18 +0000)]

Trivial merge