Merge updates from master

This commit is contained in:
Repository QA checks
2015-09-21 01:22:10 -04:00
@@ -24,7 +24,7 @@ SRC_URI="
LICENSE="GPL-2 NVIDIA-r2"
SLOT="0"
KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
RESTRICT="bindist mirror strip"
EMULTILIB_PKG="true"