Merge branch 'master' of github.com:JetBrains/kotlin

.idea/libraries/junit_plugin.xml

@@ -4,6 +4,8 @@
       <root url="jar://$PROJECT_DIR$/ideaSDK/plugins/junit/lib/idea-junit.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/plugins/junit/src" />
+    </SOURCES>
   </library>
 </component>

compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java

@@ -102,6 +102,11 @@ class ClsWrapperStubPsiFactory extends StubPsiFactory {
         if (origin == null) return delegate.createMethod(stub);
 
         return new ClsMethodImpl(stub) {
+            @Override
+            public PsiElement getMirror() {
+                return origin;
+            }
+
             @NotNull
             @Override
             public PsiElement getNavigationElement() {