Merge branch 'develop'
authorAlex Kamedov <alex@kamedov.ru>
Sun, 24 Apr 2011 15:26:33 +0000 (21:26 +0600)
committerAlex Kamedov <alex@kamedov.ru>
Sun, 24 Apr 2011 15:26:33 +0000 (21:26 +0600)

Trivial merge