[MERGE] Fix to avoid possible race conditions if import ordering is changed.

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Mattias Eriksson wrote:
> So here is the updated progress patch with the tweak John wanted. The ui
> module was already included at the top of the file, so it was just that
> one single line that neede to be changed.
> 
> //Mattias
> 

BB:approve

Submitted.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkolQTAACgkQJdeBCYSNAANQrACfT0M0VfNJ/EyKNp6YipPTn1gR
bpQAn2yZVESR+26GT3Mvt4RlLhpxJoWQ
=wwcz
-----END PGP SIGNATURE-----