From: Koen Kooi <koen@openembedded.org>
Date: Sun, 24 Jul 2005 18:17:28 +0000 (+0000)
Subject: merge of 2ab40f2da7b39983c44422e04888f7b91471b2d7
X-Git-Tag: Release-2010-05/1~9453^2~4055^2~9
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20578bdadda879474883702ec8e6aa416675785e;p=openembedded.git

merge of 2ab40f2da7b39983c44422e04888f7b91471b2d7
     and dd4ebed2bb572edf6af4257b824e42f38c9e3de9
---

20578bdadda879474883702ec8e6aa416675785e