From: Koen Kooi <koen@openembedded.org>
Date: Fri, 5 May 2006 17:13:42 +0000 (+0000)
Subject: merge of b9b3b3f5835946b0838fa649c358e5f9df8ef861
X-Git-Tag: Release-2010-05/1~9453^2~1624^2~1^2~2^2~1^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41ab47fc3f79ea7ab7473faa9c291d411f8df489;p=openembedded.git

merge of b9b3b3f5835946b0838fa649c358e5f9df8ef861
     and dbfa3b1481e36f9d201ed1307a587ea91cd36cd2
---

41ab47fc3f79ea7ab7473faa9c291d411f8df489