Merge branch 'tg/next/0.4_fix_youjizz' into next
authorToni Gundogdu <legatvs@gmail.com>
Mon, 1 Oct 2012 05:05:44 +0000 (1 08:05 +0300)
committerToni Gundogdu <legatvs@gmail.com>
Mon, 1 Oct 2012 05:05:44 +0000 (1 08:05 +0300)

Trivial merge