merge in rejected libxo patch and remove rej file