Merge branch 'master' into bootstrap3

Conflicts:
	debian/changelog

standalone/android/Makefile

@@ -76,6 +76,7 @@ build: start
 	cp $(GIT_ANNEX_ANDROID_SOURCETREE)/git/git.tar.gz $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.git.tar.gz.so
 
 	git rev-parse HEAD > $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.version.so
+	cp ../trustedkeys.gpg $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.trustedkeys.so
 
 	mkdir -p ../../tmp/4.0 ../../tmp/4.3
 	

standalone/android/runshell

@@ -53,6 +53,7 @@ buildtree () {
 	$cmd echo "exec $base/lib/lib.start.so" >> "$base/runshell"
 	$cmd chmod 755 runshell
 
+	$cmd cat "$base/lib/lib.trustedkeys.so" > "$base/bin/trustedkeys.gpg"
 	$cmd cat "$base/lib/lib.version.so" > "$base/installed-version"
 	$cmd echo "Installation complete"
 }