Merge branch 'bug_9356' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 24 Feb 2013 15:00:57 +0000 (10:00 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 24 Feb 2013 15:00:57 +0000 (10:00 -0500)

Trivial merge