Merge branch 'bug_7731' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 29 Nov 2012 00:10:45 +0000 (19:10 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 29 Nov 2012 00:10:45 +0000 (19:10 -0500)

Trivial merge