xine-lib-2: there can be only one (removing)
xine-lib: merged xine-lib and xine-lib-2 into one module
Removed xine-lib-2 from %XINELIB alias
xine-lib-vdpau does not exist, removed from aliases
xine-lib: removed CONFLICTS
Merge pull request #343 from Ratler/xine-cleanup

xine-lib, there can be only one!