Merge branch 'bug_9050' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 12 Nov 2012 23:54:24 +0000 (18:54 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 12 Nov 2012 23:54:24 +0000 (18:54 -0500)

Trivial merge