Merge branch 'bug_9065' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 13 Jan 2013 13:32:21 +0000 (08:32 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 13 Jan 2013 13:32:21 +0000 (08:32 -0500)

Trivial merge