v2.1.1rc2: Fix a minor issue with inline import statements

tagged Apr 10, 2009 · 323 commits to master since this tag

This will hopefully be the last issue related to these changes, added two more unit tests to cover these cases
and ran the whole suite successfully.

This may not have actually been the issue reported by mobiledreamers@gmail.com, but investigating his issue led
to these changes

Signed-off-by: R. Tyler Ballance <tyler@slide.com>