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

[Levente Farkas]

commit 235fbbc9aa5a087b38d0c70f29eb1c9731936da5
Merge: f6c040a e3c901e
Author: Levente Farkas <lfarkas at lfarkas.org>
Date:   Sat Aug 7 18:51:47 2010 +0200

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

---