fb5e77e033a4b4a73f8d41025769b1905ba77ca9

Author: Mark Story

Date: 2009-08-25 11:58:26 -0400

Merge branch '1.2-branch' into 1.3-branch