Merge branch 'bug_7358' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 25 Nov 2012 23:20:32 +0000 (18:20 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 25 Nov 2012 23:20:32 +0000 (18:20 -0500)

Trivial merge