Merge branch 'bug_9812' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 7 Apr 2013 17:44:37 +0000 (13:44 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 7 Apr 2013 17:44:37 +0000 (13:44 -0400)

Trivial merge