Merge branch 'bug_5343' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 03:57:05 +0000 (23:57 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 03:57:05 +0000 (23:57 -0400)

Trivial merge