[bzr-email:MERGE] cleanup imports

[John Arbash Meinel]

Robert Collins wrote:
> On Wed, 2007-02-07 at 09:52 -0600, John Arbash Meinel wrote:
> 
>> What do you think about this change? It cleans up the importing to be
>> lazy, as well as check that the plugin is installed with the expected
>> name. If it isn't, it errors out quickly, rather than at post-commit time.
> 
> +1 as it stands.
> 

done and pushed to trunk.

John
=:->