Merge branch 'bug_9423' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 02:23:21 +0000 (22:23 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 02:23:21 +0000 (22:23 -0400)

Trivial merge