commit 93a2d17162579a02bba830b7624de167fe4f268b
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Mon Feb 1 07:55:59 2016 -0700

merged from funtoo-staging

merged:

funtoo-staging: 25b8d72be414b55b126ddb771cd6f48eadda07f0

commit 5a8c0231616be3d65df692547992ed524caa266e
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Mon Nov 9 08:10:12 2015 -0700

merged from funtoo-staging

merged:

funtoo-staging: 62952522427c5a0e1de26d7be3f92d86c7e10025