I reworked this a little. The 1.2 branch isn't really very elegant about this.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404369