
* commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022': fate: add XBM tests Conflicts: tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022': fate: add XBM tests Conflicts: tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>