Merge branch 'bug_9863' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 28 Mar 2013 02:40:32 +0000 (22:40 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 28 Mar 2013 02:40:32 +0000 (22:40 -0400)

Trivial merge