Merge branch 'bug_9615' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Feb 2013 13:29:35 +0000 (08:29 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Feb 2013 13:29:35 +0000 (08:29 -0500)

Trivial merge