xine-lib, there can be only one!

Merged xine-lib-2 into xine-lib. No reason to keep two versions
around since most stuff should work just fine with 1.2.6 already.