Merge remote-tracking branch 'origin/master'

author Dmitry Trofimov <dmitry.trofimov@jetbrains.com>

Tue, 11 Feb 2014 17:07:20 +0000 (18:07 +0100)

committer Dmitry Trofimov <dmitry.trofimov@jetbrains.com>

Tue, 11 Feb 2014 17:07:20 +0000 (18:07 +0100)
author Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 11 Feb 2014 17:07:20 +0000 (18:07 +0100)
committer Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 11 Feb 2014 17:07:20 +0000 (18:07 +0100)
diff --cc python/src/com/jetbrains/python/psi/PyUtil.java
Simple merge
author	Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
	Tue, 11 Feb 2014 17:07:20 +0000 (18:07 +0100)
committer	Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
	Tue, 11 Feb 2014 17:07:20 +0000 (18:07 +0100)