Merge remote-tracking branch 'origin/master'
authorandrey.zaytsev <andrey.zaytsev@jetbrains.com>
Thu, 31 Jan 2013 18:01:44 +0000 (22:01 +0400)
committerandrey.zaytsev <andrey.zaytsev@jetbrains.com>
Thu, 31 Jan 2013 18:01:44 +0000 (22:01 +0400)

Trivial merge