Merge branch 'bug_4354' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 22 Mar 2013 00:08:17 +0000 (20:08 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 22 Mar 2013 00:08:17 +0000 (20:08 -0400)

Trivial merge