random patches to http://eclipser.xmms2.org/git/xmms2-android.git/