Switch to new 2.6 module interface -- much cleaner

3 files changed