Merge commit 'refs/merge-requests/2' of git://gitorious.org/f-droid/fdroiddata into merge-requests/2

Conflicts:
	metadata/org.bc_bd.mrwhite.txt

build/extlib/android-support-v4/source.txt

@@ -0,0 +1,3 @@
+From android-sdk-linux: "Android Support package" revision 6
+
+file: android-sdk-linux/extras/android/support/v4/android-support-v4.jar

metadata/com.noshufou.android.su.txt

@@ -0,0 +1,27 @@
+Category:System
+License:Apache2
+Web Site:http://androidsu.com/superuser
+Source Code:https://github.com/ChainsDD/Superuser
+Issue Tracker:https://github.com/ChainsDD/Superuser/issues
+
+Summary:Grant and manage Superuser rights for your phone.
+Description:
+Hook into your phone's power.
+
+Any app that requires root access must call the su binary which in turn calls this app to prompt the user for permission. This app is also used to manage which apps have root permission as well as monitor their usage of the permission.
+
+This app assumes you have the su binary installed (installing the su-binary is usually part of rooting your device).
+.
+
+Requires Root:Yes
+
+Repo Type:git
+Repo:https://github.com/ChainsDD/Superuser.git
+
+# 3.0.7 with upstream build fixes
+Build Version:3.0.7,41,912db6e5c08713c0b580b5656f35afd968e5e701,target=android-11,extlibs=android-support-v4/android-support-v4.jar
+
+Update Check Mode:Market
+Current Version:3.0.7
+Current Version Code:41
+