From: Russel Winder <russel@winder.org.uk>
Date: Wed, 2 Aug 2017 08:16:59 +0000 (+0100)
Subject: Merge in mainline.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0bf0316ecf04716211b8d2abdc441a5096e3465b;p=platform%2Fupstream%2Fscons.git

Merge in mainline.
---

0bf0316ecf04716211b8d2abdc441a5096e3465b