Merge remote-tracking branch 'origin/master'
authorVsevolod Glumov <seva17@gmail.com>
Thu, 23 Aug 2012 10:58:41 +0000 (14:58 +0400)
committerVsevolod Glumov <seva17@gmail.com>
Thu, 23 Aug 2012 10:58:41 +0000 (14:58 +0400)

Trivial merge