Merge branch 'develop'
authorAlex Kamedov <alex@kamedov.ru>
Wed, 27 Apr 2011 16:13:24 +0000 (22:13 +0600)
committerAlex Kamedov <alex@kamedov.ru>
Wed, 27 Apr 2011 16:13:24 +0000 (22:13 +0600)

Trivial merge