Merge branch 'bug_9683' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 3 Apr 2013 11:03:52 +0000 (07:03 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 3 Apr 2013 11:03:52 +0000 (07:03 -0400)

Trivial merge