From: Koen Kooi <koen@openembedded.org>
Date: Wed, 10 May 2006 19:06:25 +0000 (+0000)
Subject: merge of 079fcd329857f0a9c2515a187110ac87377cafd1
X-Git-Tag: Release-2010-05/1~9453^2~1730^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48faf1fb0846af5a9cdd66d9b0761edc9bba3ba0;p=openembedded.git

merge of 079fcd329857f0a9c2515a187110ac87377cafd1
     and 283024b09313f04ab41944556c579e5bedba69c3
---

48faf1fb0846af5a9cdd66d9b0761edc9bba3ba0