Merge remote-tracking branch 'origin/master'
authorVsevolod Glumov <vsevolod.glumov@itseez.com>
Wed, 15 Aug 2012 11:12:48 +0000 (15:12 +0400)
committerVsevolod Glumov <vsevolod.glumov@itseez.com>
Wed, 15 Aug 2012 11:12:48 +0000 (15:12 +0400)

Trivial merge