Merge pull request #199 from lissyx/bug1009396

Bug 1009396 - Use CAF sources for pronto WLAN r=mwu
Conflicts:
	flame.xml