Merge branch 'master' into sort
authorpeter <peter@jetbrains.com>
Fri, 11 Feb 2011 15:55:52 +0000 (16:55 +0100)
committerpeter <peter@jetbrains.com>
Fri, 11 Feb 2011 15:55:52 +0000 (16:55 +0100)

Trivial merge