Merge remote branch 'origin/master'
authorDmitry Jemerov <yole@jetbrains.com>
Thu, 12 Jan 2012 18:05:39 +0000 (19:05 +0100)
committerDmitry Jemerov <yole@jetbrains.com>
Thu, 12 Jan 2012 18:05:39 +0000 (19:05 +0100)

Trivial merge