Merge remote-tracking branch 'origin/master'
authorKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Fri, 7 Oct 2011 13:25:14 +0000 (17:25 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Fri, 7 Oct 2011 13:25:14 +0000 (17:25 +0400)

Trivial merge