Merge branch 'bug_9731' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 01:51:43 +0000 (21:51 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 01:51:43 +0000 (21:51 -0400)

Trivial merge