Merge branch 'bug_9641' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 18 Feb 2013 14:05:51 +0000 (09:05 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 18 Feb 2013 14:05:51 +0000 (09:05 -0500)

Trivial merge