From: ccsmart <ccsmart@smartpal.de>
Date: Wed, 17 Jan 2007 20:03:31 +0000 (+0000)
Subject: merge of '49e38996bda7c1309e587226a9c3d152d0bb62e2'
X-Git-Tag: Release-2010-05/1~9361^2~7^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae6b880bc785a04119f3db1184ac615e9d92665b;p=openembedded.git

Merge ... '49e38996bda7c1309e587226a9c3d152d0bb62e2'
     and '8458cc771a74a1ab393f4fb0a2c3b69c419daad3'
---

ae6b880bc785a04119f3db1184ac615e9d92665b