a030576052
Conflicts: compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java idea/src/org/jetbrains/jet/plugin/project/WholeProjectAnalyzerFacade.java idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java