From 221ac2b25f544a500869667d8f95c6c12c80db1a Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 30 Sep 2008 20:46:17 +0000
Subject: bitbake/bitbake-dev: Sync with upstream

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5346 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 bitbake/lib/bb/parse/parse_py/ConfHandler.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'bitbake/lib/bb/parse/parse_py/ConfHandler.py')

diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index e6488bbe11..f8a49689e2 100644
--- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
@@ -118,7 +118,6 @@ def handle(fn, data, include = 0):
     init(data)
 
     if include == 0:
-        bb.data.inheritFromOS(data)
         oldfile = None
     else:
         oldfile = bb.data.getVar('FILE', data)
-- 
cgit v1.2.3-54-g00ecf