Prevent double-calling oo-trap-user twice
Merge pull request #1 from liggitt/BZ1024102

Prevent double-calling oo-trap-user