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

Trivial merge