[gstreamer-java: 37/37] Merge remote branch 'origin/el6/master'

[Levente Farkas]

commit 17fe8b0bac87ed1af3433bfc5e037266f26cb9d2
Merge: 235fbbc 50a1a33
Author: Levente Farkas <lfarkas at lfarkas.org>
Date:   Sat Aug 7 18:52:14 2010 +0200

    Merge remote branch 'origin/el6/master'
    
    Conflicts:
    	gstreamer-java.spec
    	sources

---