Merge branch 'bug_9451' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 8 Feb 2013 13:42:35 +0000 (08:42 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 8 Feb 2013 13:42:35 +0000 (08:42 -0500)

Trivial merge