Merge branch 'switcher'

author Kirill Kalishev <kirill.kalishev@jetbrains.com>

Wed, 26 May 2010 13:15:48 +0000 (17:15 +0400)

committer Kirill Kalishev <kirill.kalishev@jetbrains.com>

Wed, 26 May 2010 13:15:48 +0000 (17:15 +0400)
author Kirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 26 May 2010 13:15:48 +0000 (17:15 +0400)
committer Kirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 26 May 2010 13:15:48 +0000 (17:15 +0400)
diff --cc platform/platform-resources-en/src/misc/registry.properties
Simple merge
author	Kirill Kalishev <kirill.kalishev@jetbrains.com>
	Wed, 26 May 2010 13:15:48 +0000 (17:15 +0400)
committer	Kirill Kalishev <kirill.kalishev@jetbrains.com>
	Wed, 26 May 2010 13:15:48 +0000 (17:15 +0400)