From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Fri, 7 Jul 2006 00:54:21 +0000 (+0000)
Subject: merge of c1749e31b60b984658b557139430b4fe8eb432a7
X-Git-Tag: Release-2010-05/1~9453^2~1301^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0825e944345291cac5d45daae904c50a87389642;p=openembedded.git

merge of c1749e31b60b984658b557139430b4fe8eb432a7
     and e1dfbc0aedf7759ad0b062d01ebcad3149da58f9
---

0825e944345291cac5d45daae904c50a87389642