Merge branch 'slave'
authorpeter <peter.gromov@jetbrains.com>
Sun, 22 Aug 2010 18:53:13 +0000 (19:53 +0100)
committerpeter <peter.gromov@jetbrains.com>
Sun, 22 Aug 2010 18:53:13 +0000 (19:53 +0100)

Trivial merge