wlan and bluetooth
Merge branch 'master' of github.com:bse666/raspberrypi

Conflicts:
	function/bluetooth