[xine-ui/el6: 5/6] Merge commit '6f3cab1' into el6

[mjg]

commit 8ac9e7483b8e4c95f439db8d18dc314deb28a3bf
Merge: f439024 6f3cab1
Author: Michael J Gruber <mjg at fedoraproject.org>
Date:   Fri Aug 31 12:06:46 2012 +0200

    Merge commit '6f3cab1' into el6
    
    Bring el6 in sync with latest 0.99.6 on master

 xine-ui-0.99.6-libpng-1.5.patch |   11 +++++++++++
 xine-ui.spec                    |   21 ++++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)
---