#3949 duplicate entry 'poll','journal'

[shane]

looks like someone added the INSERT INTO's into the sql/mysql/defaults, but they are already in the pollbooth and journal plugin's mysqldump files.

Error:Slash::Install:/Library/Perl/5.8.6/darwin-thread-multi-2level/Slash/Install.pm:435:virtuser='slash' -- hostinfo='Localhost via UNIX socket' -- Duplicate entry 'poll' for key 2 -- INSERT INTO discussion_kinds (dkid, name) VALUES (NULL, 'poll')
Which was called by:Slash::Install:/Library/Perl/5.8.6/darwin-thread-multi-2level/Slash/Install.pm:167
=== (plugin PollBooth) Failed on: INSERT INTO discussion_kinds (dkid, name) VALUES (NULL, 'poll'):
Error:Slash::Install:/Library/Perl/5.8.6/darwin-thread-multi-2level/Slash/Install.pm:435:virtuser='slash' -- hostinfo='Localhost via UNIX socket' -- Duplicate entry 'journal' for key 2 -- INSERT INTO discussion_kinds (dkid, name) VALUES (NULL, 'journal')
Which was called by:Slash::Install:/Library/Perl/5.8.6/darwin-thread-multi-2level/Slash/Install.pm:167
=== (plugin Journal) Failed on: INSERT INTO discussion_kinds (dkid, name) VALUES (NULL, 'journal'):
Error:Slash::Install:/Library/Perl/5.8.6/darwin-thread-multi-2level/Slash/Install.pm:435:virtuser='slash' -- hostinfo='Localhost via UNIX socket' -- Duplicate entry 'journal-story' for key 2 -- INSERT INTO discussion_kinds (dkid, name) VALUES (NULL, 'journal-story')
Which was called by:Slash::Install:/Library/Perl/5.8.6/darwin-thread-multi-2level/Slash/Install.pm:167
=== (plugin Journal) Failed on: INSERT INTO discussion_kinds (dkid, name) VALUES (NULL, 'journal-story'):

[shane]

Logged In: YES
user_id=52587
Originator: YES

So does anyone have any idea of what the proper fix is? remove from mysq/defaults, or remove from each plugin?