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)
commit095e7dd0aa9cf35daa06efb33ca5240574c62664
treee5fbc7e8b5db482d505de60dfb3235c13e236240
parentad864410d7534c5dd596b5b2d6436eeacdc590a6
parent40421f9ceade7f7e01c0acd3bae71b4b3de0bc51
Merge branch 'hs'