Merge remote-tracking branch 'origin/master'
authorMaxim.Mossienko <maxim.mossienko@jetbrains.com>
Mon, 23 Apr 2012 20:43:32 +0000 (00:43 +0400)
committerMaxim.Mossienko <maxim.mossienko@jetbrains.com>
Mon, 23 Apr 2012 20:43:32 +0000 (00:43 +0400)

Trivial merge