Merge remote-tracking branch 'origin/master'
authorKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Mon, 19 Dec 2011 14:30:03 +0000 (17:30 +0300)
committerKirill Likhodedov <Kirill.Likhodedov@gmail.com>
Mon, 19 Dec 2011 14:30:03 +0000 (17:30 +0300)

Trivial merge