commit a11f91cbd616e22d1eb080d3f2d5973c4828ff9f Merge: 7c14f18 3fb3f29 2313c67 23aaa70 188ac5e Author: John Khvatov <ivaxer at sgu.ru> Date: Sun Aug 1 22:07:55 2010 +0400 Initial pseudo merge for dist-git setup ---