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

Trivial merge