Merge branch 'bug_9911' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 12:27:15 +0000 (08:27 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 12:27:15 +0000 (08:27 -0400)

Trivial merge