Merge remote branch 'origin/master'
authorDmitry Jemerov <yole@jetbrains.com>
Thu, 13 Oct 2011 09:08:43 +0000 (11:08 +0200)
committerDmitry Jemerov <yole@jetbrains.com>
Thu, 13 Oct 2011 09:08:43 +0000 (11:08 +0200)

Trivial merge