Merge branch 'bug_9059' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 25 Nov 2012 23:34:00 +0000 (18:34 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 25 Nov 2012 23:34:00 +0000 (18:34 -0500)

Trivial merge