Merge remote-tracking branch 'remotes/sbraz/backports'
authorIan Delaney <idella4@gentoo.org>
Tue, 29 Dec 2015 22:54:28 +0000 (06:54 +0800)
committerIan Delaney <idella4@gentoo.org>
Tue, 29 Dec 2015 22:54:28 +0000 (06:54 +0800)
Pull request: https://github.com/gentoo/gentoo/pull/558


Trivial merge