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

Trivial merge