Updated the PKGBUILD with the fex and env files for the A10S-olinixino and the A13-olinuxino. The build files were NOT added so md5sums will be checked but will not be built for the mentioned platforms for uboot.
Updated the PKGBUILD to include the A13-OLinuXino-Micro.
Merge remote-tracking branch 'upstream/master'
Fixed a change in make for number of cores used. Should be ready for a pull request.
Bumped package version and date.
Fixed the Package version information after consulting with Jason Plum.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/wirewc/PKGBUILDs
xx
Updated the PKGBUILD to include the a10s micro and a10s micro 7 inch lcd boards.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into olimex
Merge branch 'olimex' of https://github.com/wirewc/PKGBUILDs into olimex

Conflicts:
	alarm/uboot-sunxi/PKGBUILD
Trying to fix the build, it is not accepting the current PKGBUILD.
Merge remote-tracking branch 'upstream/master'
make -j5 to make

Fixed as per request.
Using micro instead of m for packages.
Naming conventions

Fixed the naming for the a13-olinuxino-micro
Revert "core/linux-wandboard enable cec"

This reverts commit 78dde70072cfa54b25a782b5c024b1c4f742368c.

Conflicts:
	core/linux-wandboard/PKGBUILD
extra/x264 to 142.20140311-6