a44f0c2f2d
Conflicts: compiler/backend/src/org/jetbrains/jet/codegen/JavaSerializerExtension.java
Conflicts: compiler/backend/src/org/jetbrains/jet/codegen/JavaSerializerExtension.java