Merge branch 'bug_9106' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 28 Nov 2012 20:42:43 +0000 (15:42 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 28 Nov 2012 20:42:43 +0000 (15:42 -0500)

Trivial merge