Merge branch 'idea90' of git.labs.intellij.net:idea/community into idea90
commit3c04693468441a82aa389ce7ff7d6463c6b5973b
authorpeter <peter.gromov@jetbrains.com>
Wed, 13 Jan 2010 11:17:24 +0000 (13 11:17 +0000)
committerpeter <peter.gromov@jetbrains.com>
Wed, 13 Jan 2010 11:17:24 +0000 (13 11:17 +0000)
treea8b388661eeb561d3d2e3ab920f6a3285719f8b6
parentacc3691cd7e2686d3d6b5850cec3175f3417e6d7
parentae7fa1382b499142628691cca0b2fd3fba448014
Merge branch 'idea90' of git.labs.intellij.net:idea/community into idea90