Merge branch 'bug_8117' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 2 Dec 2012 14:21:50 +0000 (09:21 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 2 Dec 2012 14:21:50 +0000 (09:21 -0500)

Trivial merge