Merge branch 'master' into changeSignature

author Maxim Medvedev <maxim.medvedev@jetbrains.com>

Tue, 1 Jun 2010 05:45:59 +0000 (09:45 +0400)

committer Maxim Medvedev <maxim.medvedev@jetbrains.com>

Tue, 1 Jun 2010 05:45:59 +0000 (09:45 +0400)
author Maxim Medvedev <maxim.medvedev@jetbrains.com>
Tue, 1 Jun 2010 05:45:59 +0000 (09:45 +0400)
committer Maxim Medvedev <maxim.medvedev@jetbrains.com>
Tue, 1 Jun 2010 05:45:59 +0000 (09:45 +0400)
diff --cc plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java
Simple merge
diff --cc resources/src/META-INF/IdeaPlugin.xml
Simple merge
author	Maxim Medvedev <maxim.medvedev@jetbrains.com>
	Tue, 1 Jun 2010 05:45:59 +0000 (09:45 +0400)
committer	Maxim Medvedev <maxim.medvedev@jetbrains.com>
	Tue, 1 Jun 2010 05:45:59 +0000 (09:45 +0400)
		1	2
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java	patch \|	diff1 \|	diff2 \|	blob \| history
resources/src/META-INF/IdeaPlugin.xml	patch \|	diff1 \|	diff2 \|	blob \| history