Merge remote branch 'origin/master'
authorDmitry Jemerov <yole@jetbrains.com>
Wed, 1 Feb 2012 14:02:35 +0000 (15:02 +0100)
committerDmitry Jemerov <yole@jetbrains.com>
Wed, 1 Feb 2012 14:02:35 +0000 (15:02 +0100)

Trivial merge