Merge branch 'bug_9504' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 12:36:59 +0000 (08:36 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 12:36:59 +0000 (08:36 -0400)

Trivial merge