Merge branch 'bug_9377' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 11 Mar 2013 12:08:55 +0000 (08:08 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 11 Mar 2013 12:08:55 +0000 (08:08 -0400)

Trivial merge