Merge in changes from stable.

This commit is contained in:
Albert Hopkins 2015-02-22 16:31:02 +00:00
commit 958ef1a7b9
1 changed files with 1 additions and 0 deletions

View File

@ -11,4 +11,5 @@ EPAUSE_IGNORE="1"
EMERGE_DEFAULT_OPTS="--jobs=2 --autounmask=n"
FEATURES="noinfo -test nodoc noman nostrip unmerge-orphans buildpkg notitles parallel-fetch"
CURL_SSL="openssl"
PYTHON_TARGETS="python3_4"
ABI_X86="32"