Merge branch 'bug_9207' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 11 Mar 2013 12:57:19 +0000 (08:57 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 11 Mar 2013 12:57:19 +0000 (08:57 -0400)

Trivial merge