Merge branch 'bug_9971' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 3 Apr 2013 10:02:13 +0000 (06:02 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 3 Apr 2013 10:02:13 +0000 (06:02 -0400)

Trivial merge