Bug 925469 - Import errors in __init__.py, r=dburns