Merge branch 'bug_7440' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 01:20:30 +0000 (21:20 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 01:20:30 +0000 (21:20 -0400)

Trivial merge