Merge branch 'bug_6428' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 13 Nov 2012 14:48:16 +0000 (09:48 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 13 Nov 2012 14:48:16 +0000 (09:48 -0500)

Trivial merge