Merge branch 'hs'
authorpeter <peter.gromov@jetbrains.com>
Mon, 22 Mar 2010 22:30:16 +0000 (22:30 +0000)
committerpeter <peter.gromov@jetbrains.com>
Mon, 22 Mar 2010 22:30:16 +0000 (22:30 +0000)

Trivial merge