Merge branch 'bug_9556' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Feb 2013 13:37:25 +0000 (08:37 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Feb 2013 13:37:25 +0000 (08:37 -0500)

Trivial merge