Merge branch 'bug_9346' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 8 Jan 2013 01:47:41 +0000 (20:47 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 8 Jan 2013 01:47:41 +0000 (20:47 -0500)

Trivial merge