Comment 51 for bug 1200829

Their "merge" seems to be weird, I've asked the Ubuntu xorg team about that, they said that Peter has a tree where he merges stuff then it land updates in the main tree later on, not sure if that landing is blocked on have a test case though