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

Trivial merge