[xine-ui/el6: 23/23] Merge branch 'f16' into el6

[mjg]

commit f43902427b3ae8c8a667eac8bab980bfd15a3344
Merge: 3e4f44a a778d27
Author: Michael J Gruber <mjg at fedoraproject.org>
Date:   Fri May 18 10:34:16 2012 +0200

    Merge branch 'f16' into el6
    
    Conflicts:
    	xine-ui.spec
    
    Bring back el6 to f16 (though ftb)

 xine-ui-0.99.6-curl-types.patch |   10 +++
 xine-ui.spec                    |  120 +++++++++++++++++++++++++-------------
 2 files changed, 89 insertions(+), 41 deletions(-)
---