Merge remote-tracking branch 'remotes/tomboy-64/idea-ultimate'
authorIan Delaney <idella4@gentoo.org>
Sat, 5 Dec 2015 14:20:03 +0000 (22:20 +0800)
committerIan Delaney <idella4@gentoo.org>
Sat, 5 Dec 2015 14:23:40 +0000 (22:23 +0800)
Review by jlec, adjustments made accordingly

Pull request: https://github.com/gentoo/gentoo/pull/428


Trivial merge