Merge branch 'bug_6945' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 30 Nov 2012 12:38:55 +0000 (07:38 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 30 Nov 2012 12:38:55 +0000 (07:38 -0500)

Trivial merge