commit 8122aa0afb0659a5a8b5d2f4c9006747f52a8d19
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Thu Jan 12 03:35:38 2017 -0700

merged from funtoo-staging

merged:

funtoo-staging: 4e90c8add7a8c8e287feb8db2a317781c3cc0727

commit 2ff61b3b8fd1c62eaed0c93058d029e8ee7f3192
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Sun Nov 6 09:56:37 2016 -0700

merged from funtoo-staging

merged:

funtoo-staging: 60f84bf4658e3e64027a53050d6b6f8bc31c3a00