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

Trivial merge