Merge branch 'develop'
authorAlex Kamedov <alex@kamedov.ru>
Wed, 27 Apr 2011 14:49:43 +0000 (20:49 +0600)
committerAlex Kamedov <alex@kamedov.ru>
Wed, 27 Apr 2011 14:49:43 +0000 (20:49 +0600)

Trivial merge