commit 4def2fa79e7c522e9469e4d1dffd538797a7d92c
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Sat Feb 4 13:53:20 2017 -0700

merged from funtoo-staging

merged:

funtoo-staging: 023be01c8c646c5ee23f59ef3fadcad84dc041c8

commit a5146ac3ada36d765a29dca6b22656b1f7252c94
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Tue Jan 10 00:10:58 2017 -0700

merged from funtoo-staging

merged:

funtoo-staging: c4b8c6b92d0a4e30e20a92f9a1f3f1cd52cd4d43