Merge branch 'bug_9660' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 01:49:23 +0000 (21:49 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 01:49:23 +0000 (21:49 -0400)

Trivial merge