From: Koen Kooi <koen@openembedded.org>
Date: Thu, 18 May 2006 12:48:07 +0000 (+0000)
Subject: merge of 3ce424d5d8f31e0ba22a3979298d97c8a37e4f4a
X-Git-Tag: Release-2010-05/1~9453^2~1683
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30ae70170fb606b4468bcad87e879e075ec90177;p=openembedded.git

merge of 3ce424d5d8f31e0ba22a3979298d97c8a37e4f4a
     and 8e42a3791620b4411df47a038ef0451b2fbd4432
---

30ae70170fb606b4468bcad87e879e075ec90177