merge trunk to moose-exporter branch
Dave Rolsky [Fri, 8 Aug 2008 16:15:58 +0000 (16:15 +0000)]

Trivial merge