4.0-5569 vs. 4.0-5567 / ogl-lin-mesa / chibi-robo-zfighting

4.0-5569 (6bbf7745) Diff 4.0-5567 (5da28f39)
d6587e1e0d8cc2ce83db5d9ca06e7191e65d3798 Waiting for diff... 734ee6081d4a6803ef58306c31c671c60ce14270
5765ced1e86e8f228854e650ce97c98e16fefe75 Waiting for diff... 29f7c2c7395d60e944485f564054495f1e03b9ad
5765ced1e86e8f228854e650ce97c98e16fefe75 Waiting for diff... 29f7c2c7395d60e944485f564054495f1e03b9ad
d3d1ce3e1e92a1a48ee54b9dab98f685a53f5447 Waiting for diff... 36891f281859d232357e0abd6b7bb7bb9cd6d657