Merge commit 'origin/master'
authorEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Thu, 23 Jun 2011 16:50:34 +0000 (20:50 +0400)
committerEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Thu, 23 Jun 2011 16:50:34 +0000 (20:50 +0400)

Trivial merge