Merge branch 'bug_9674' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 2 Mar 2013 17:22:10 +0000 (12:22 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 2 Mar 2013 17:22:10 +0000 (12:22 -0500)

Trivial merge