Merge remote-tracking branch 'remotes/jbergstroem/fix/dev-libs/ucl-conflict'
authorIan Delaney <idella4@gentoo.org>
Tue, 9 Feb 2016 07:17:35 +0000 (15:17 +0800)
committerIan Delaney <idella4@gentoo.org>
Tue, 9 Feb 2016 07:17:35 +0000 (15:17 +0800)
Pull request: https://github.com/gentoo/gentoo/pull/819


Trivial merge