From: Koen Kooi <koen@openembedded.org>
Date: Tue, 13 Dec 2005 14:21:19 +0000 (+0000)
Subject: merge of 24e9a57c16a592bd13ccd1e8cf31feac9a2510a3
X-Git-Tag: Release-2010-05/1~9453^2~2931^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebfd8bc926fe24a224e7ca2cfd183f810f724044;p=openembedded.git

merge of 24e9a57c16a592bd13ccd1e8cf31feac9a2510a3
     and d4e0f069245e5657ad844349d78d5b45d9e02d3c
---

ebfd8bc926fe24a224e7ca2cfd183f810f724044