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

Trivial merge