Merge branch 'bug_9466' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Mar 2013 23:23:31 +0000 (19:23 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Mar 2013 23:23:31 +0000 (19:23 -0400)

Trivial merge