1ef94033ab2ba8962676098e6943fd2f0221e1ec

Author: Mark Story

Date: 2009-09-12 21:58:01 -0400

Merge branch 'master' into 1.3-branch