make this module a bit more 0.9 friendly

Original commit message from CVS:
make this module a bit more 0.9 friendly
20 files changed