22464695eb4436bd8d2e425b2fb8f9e5d22bc959

Author: Mark Story

Date: 2009-12-01 18:16:13 -0500

Merge branch 'master' into 1.3-branch