Merge branch 'tg/next/0.4_testrun_fixes' into next
authorToni Gundogdu <legatvs@gmail.com>
Thu, 31 Jan 2013 18:36:43 +0000 (31 20:36 +0200)
committerToni Gundogdu <legatvs@gmail.com>
Thu, 31 Jan 2013 18:36:43 +0000 (31 20:36 +0200)

Trivial merge