From: Koen Kooi <koen@openembedded.org>
Date: Fri, 7 Oct 2005 07:49:42 +0000 (+0000)
Subject: merge of 063f5fcd2659dd00fdd34f052bb22a04c2558a5f
X-Git-Tag: Release-2010-05/1~9453^2~3331
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9d9dfe52f9fd6209f60aa91c7f3f245f7444b69;p=openembedded.git

merge of 063f5fcd2659dd00fdd34f052bb22a04c2558a5f
     and 8cb9fe0395955b9160edc9f54e42830aa08e5823
---

b9d9dfe52f9fd6209f60aa91c7f3f245f7444b69