Merge branch 'bug_7657' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 16 Jan 2013 02:52:04 +0000 (21:52 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 16 Jan 2013 02:52:04 +0000 (21:52 -0500)

Trivial merge