Merge branch 'bug_9263' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 23 Jan 2013 00:12:40 +0000 (19:12 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 23 Jan 2013 00:12:40 +0000 (19:12 -0500)

Trivial merge