Merge remote branch 'origin/master'
authorDmitry Jemerov <yole@jetbrains.com>
Fri, 27 Jan 2012 15:02:37 +0000 (16:02 +0100)
committerDmitry Jemerov <yole@jetbrains.com>
Fri, 27 Jan 2012 15:02:37 +0000 (16:02 +0100)

Trivial merge