From: Koen Kooi <koen@openembedded.org>
Date: Fri, 2 Sep 2005 13:25:22 +0000 (+0000)
Subject: merge of 445191ac8aa50c61b1a86a6ed50f98515cfe4502
X-Git-Tag: Release-2010-05/1~9453^2~3649^2~7
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d39b2a5f78571e8a68cce6434773e84b4cffee5;p=openembedded.git

merge of 445191ac8aa50c61b1a86a6ed50f98515cfe4502
     and 8ea4e34f565a6ef515ff201e69997d656976d488
---

1d39b2a5f78571e8a68cce6434773e84b4cffee5