Merge branch 'bug_4266' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Mar 2013 22:54:07 +0000 (18:54 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Mar 2013 22:54:07 +0000 (18:54 -0400)

Trivial merge