Merge branch 'bug_9268' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 31 Jan 2013 16:40:26 +0000 (11:40 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 31 Jan 2013 16:40:26 +0000 (11:40 -0500)

Trivial merge