Merge branch 'bug_9704' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 19:24:32 +0000 (15:24 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 19:24:32 +0000 (15:24 -0400)

Trivial merge