4.0-5225 vs. 4.0-5222 / ogl-lin-mesa / chibi-robo-zfighting

4.0-5225 (49842159) Diff 4.0-5222 (e7f2a046)
d92e573bbe41b3ee139f10b2af9b136c3574923f Waiting for diff... a7b0f94808e11e10cc416e5c51700d9869230e42
5e69b9e906514b0764e22c74882f0c8138ed254f Waiting for diff... e1cf3811a573c9c9088f90f5ea3adf8adf2b8379
5e69b9e906514b0764e22c74882f0c8138ed254f Waiting for diff... e1cf3811a573c9c9088f90f5ea3adf8adf2b8379
c95c9fef45114893a8fa118da1dde421353f4af5 Waiting for diff... fa6f1e028350050f36a9cfb2e7d8f0808355ec6e