Merge branch 'bug_9608' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Feb 2013 12:49:16 +0000 (07:49 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Feb 2013 12:49:16 +0000 (07:49 -0500)

Trivial merge