Fix mesa to work against trunk Mir again