Merge branch 'bug_9276' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 18 Jan 2013 03:10:48 +0000 (22:10 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 18 Jan 2013 03:10:48 +0000 (22:10 -0500)

Trivial merge