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

Trivial merge