update sdcard_image for newer u-boot
little correction
Add support for A10S-OLinuXino-MICRO board
Merge branch 'master' of https://github.com/RehiveTech/meta-allwinner

Conflicts:
	recipes-bsp/u-boot/u-boot_git.bb
	recipes-kernel/linux/linux-sunxi_3.4-git.bb
cp to the right place
update conf files
rename a10 to sunxi
add fexfiles
update sd_card_image class to generate script.bin