From: Koen Kooi <koen@openembedded.org>
Date: Mon, 15 Aug 2005 22:52:40 +0000 (+0000)
Subject: merge of 2d7197eeafa133909e9e8460e7954cb93dfc840b
X-Git-Tag: Release-2010-05/1~9453^2~3858^2~7
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=723dbb046124da44e93f6e12147683a6ac1942fb;p=openembedded.git

merge of 2d7197eeafa133909e9e8460e7954cb93dfc840b
     and be25e7a6e0d2e4e3d6c910cc94bc112dfa979fed
---

723dbb046124da44e93f6e12147683a6ac1942fb