Merge remote branch 'origin/master'
authorDmitry Jemerov <yole@jetbrains.com>
Fri, 7 Oct 2011 09:50:47 +0000 (11:50 +0200)
committerDmitry Jemerov <yole@jetbrains.com>
Fri, 7 Oct 2011 09:50:47 +0000 (11:50 +0200)

Trivial merge