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

[Levente Farkas]

commit 1f81704c0884da408c1e3e479fb6a60a397ec63c
Merge: 04bfbfa 0cfbb4c
Author: Levente Farkas <lfarkas at lfarkas.org>
Date:   Sat Aug 7 18:50:37 2010 +0200

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

---