Merge branch 'bug_5333' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 1 Mar 2013 00:11:27 +0000 (19:11 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 1 Mar 2013 00:11:27 +0000 (19:11 -0500)

Trivial merge