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

[Levente Farkas]

commit f6c040a931f16bb32ca0fa7b551b5e82b79c0eaf
Merge: 1f81704 d53183a
Author: Levente Farkas <lfarkas at lfarkas.org>
Date:   Sat Aug 7 18:51:14 2010 +0200

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

---