(empty) merge from trunk to moose-manual branch
Dave Rolsky [Fri, 9 Jan 2009 03:45:00 +0000 (03:45 +0000)]

Trivial merge