Merge branch 'bug_9695' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 13 Mar 2013 12:43:45 +0000 (08:43 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 13 Mar 2013 12:43:45 +0000 (08:43 -0400)

Trivial merge