Merge branch 'bug_9436' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Mar 2013 23:24:34 +0000 (19:24 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Mar 2013 23:24:34 +0000 (19:24 -0400)

Trivial merge