Merge remote-tracking branch 'origin/master'
authorVassiliy Kudryashov <Vassiliy.Kudryashov@jetbrains.com>
Tue, 13 Nov 2012 13:00:53 +0000 (17:00 +0400)
committerVassiliy Kudryashov <Vassiliy.Kudryashov@jetbrains.com>
Tue, 13 Nov 2012 13:00:53 +0000 (17:00 +0400)

Trivial merge