Merge branch 'bug_9440' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 12 Feb 2013 13:52:21 +0000 (08:52 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 12 Feb 2013 13:52:21 +0000 (08:52 -0500)

Trivial merge