Merge branch 'bug_9226' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Feb 2013 13:34:13 +0000 (08:34 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Feb 2013 13:34:13 +0000 (08:34 -0500)

Trivial merge