Merge remote branch 'origin/master'

Conflicts:
	idea/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java

idea/testData/codegen/classes/enclosingLocalVariable.jet

@@ -0,0 +1,8 @@
+fun box() : String {
+    val cl = 39
+    return if (sum(200, { cl }) == 2) "OK" else "FAIL"
+}
+
+fun sum(arg:Int, f : {() : Int}) : Int {
+    return arg + f()
+}