Merge branch 'bug_9883' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 22 Mar 2013 13:52:37 +0000 (09:52 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 22 Mar 2013 13:52:37 +0000 (09:52 -0400)

Trivial merge