Merge branch 'pdc' into release
Len Brown [Thu, 24 Dec 2009 06:17:21 +0000 (01:17 -0500)]

Trivial merge