Merge remote-tracking branch 'origin/master'
authorVassiliy Kudryashov <Vassiliy.Kudryashov@jetbrains.com>
Tue, 5 Mar 2013 19:37:58 +0000 (23:37 +0400)
committerVassiliy Kudryashov <Vassiliy.Kudryashov@jetbrains.com>
Tue, 5 Mar 2013 19:37:58 +0000 (23:37 +0400)

Trivial merge