pr-12972-34db4f vs. 2407-117 / ogl-lin-mesa / chibi-robo-zfighting

pr-12972-34db4f (34db4f94) Diff 2407-117 (8a50676b)
e187dbbe9a02710ce7819637ab0d9932cc42759f Waiting for diff... 89142dc2d4895d9222d12293e1fa35ef97e4ee82
560fd17b373b61415c3a2618018f690cccd6194d Waiting for diff... 3ca25f16ab63a6aa93cd1cdad42f1fa73f42ae19
54b489ef740456cb86b735e3d9276f63293f639b Waiting for diff... 9feea1ee8799aa99c0c6c351a6a8fabd3d548bf0