Merge branch 'bug_9884' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 21 Mar 2013 11:49:11 +0000 (07:49 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 21 Mar 2013 11:49:11 +0000 (07:49 -0400)

Trivial merge