Pull ec into release branch
Len Brown [Sat, 25 Aug 2007 02:19:44 +0000 (22:19 -0400)]

Trivial merge