Merge branch 'branch1'
authorDaniil Osokin <daniil.osokin@itseez.com>
Tue, 14 Aug 2012 08:10:45 +0000 (12:10 +0400)
committerDaniil Osokin <daniil.osokin@itseez.com>
Tue, 14 Aug 2012 08:10:45 +0000 (12:10 +0400)

Trivial merge