Merge branch 'ec' into release
Len Brown [Wed, 20 Jan 2010 06:20:36 +0000 (01:20 -0500)]

Trivial merge