Merge branch 'bug_9619' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 18 Feb 2013 12:59:17 +0000 (07:59 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 18 Feb 2013 12:59:17 +0000 (07:59 -0500)

Trivial merge