[xine-lib/f16: 7/7] Merge branch 'master' of ssh://pkgs.fedoraproject.org/xine-lib into f16

[Kevin Kofler]

commit 84b672c560624d780e2d8748142384108d302c61
Merge: 93d016b 7537d5e
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Jul 21 12:08:54 2012 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/xine-lib into f16

 .gitignore                  |    1 +
 sources                     |    2 +-
 xine-lib-cleanup-sources.sh |    5 ++++-
 xine-lib.spec               |   25 ++++++++++++++++++++++---
 4 files changed, 28 insertions(+), 5 deletions(-)
---