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

Trivial merge