Merge branch 'bug_9335' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 8 Jan 2013 02:13:11 +0000 (21:13 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 8 Jan 2013 02:13:11 +0000 (21:13 -0500)

Trivial merge