Merge branch 'ducktype'
Chris Prather [Fri, 27 Mar 2009 21:46:56 +0000 (17:46 -0400)]

Trivial merge