Merge commit 'origin/master'
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Fri, 30 Jul 2010 09:05:01 +0000 (13:05 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Fri, 30 Jul 2010 09:05:01 +0000 (13:05 +0400)
commitc4659507d85aa9bd3c3b7e0b382104fa41fd77ee
treec78964a1bf997e401f26033c3d127c7a49a4c219
parent807cdd9566ac0dad4d0cef447bf80bd6a976efb7
parent82922f2eb5ba938a6552f2b8ed5b8f413fcf9c49
Merge commit 'origin/master'

Conflicts:
plugins/groovy/src/org/jetbrains/plugins/groovy/findUsages/GroovyConstructorUsagesSearchHelper.java
plugins/groovy/src/org/jetbrains/plugins/groovy/findUsages/GroovyConstructorUsagesSearcher.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java