Merge branch 'bug_9030' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 28 Nov 2012 23:46:18 +0000 (18:46 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 28 Nov 2012 23:46:18 +0000 (18:46 -0500)

Trivial merge