added "with context" or "without context" import/include modifiers

--HG--
branch : trunk
6 files changed