Merge trunk to meta-role-helper branch
Dave Rolsky [Mon, 25 Aug 2008 15:45:48 +0000 (15:45 +0000)]

Trivial merge