Merge remote-tracking branch 'origin/master'
authorKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Wed, 28 Dec 2011 16:44:46 +0000 (19:44 +0300)
committerKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Wed, 28 Dec 2011 16:44:46 +0000 (19:44 +0300)

Trivial merge