Merge remote branch 'origin/master'
authorDmitry Jemerov <yole@jetbrains.com>
Tue, 31 Jan 2012 15:49:56 +0000 (16:49 +0100)
committerDmitry Jemerov <yole@jetbrains.com>
Tue, 31 Jan 2012 15:49:56 +0000 (16:49 +0100)

Trivial merge