Merge branch 'bug_5608' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 22 Mar 2013 02:16:16 +0000 (22:16 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 22 Mar 2013 02:16:16 +0000 (22:16 -0400)

Trivial merge