From: Koen Kooi <koen@openembedded.org>
Date: Wed, 5 Jul 2006 12:11:44 +0000 (+0000)
Subject: merge of 6859af4fc51969fe6d5b6513f506486d9437a4cd
X-Git-Tag: Release-2010-05/1~9453^2~1335^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31d29bc3fc70189155f55351000b8447e03fcbd3;p=openembedded.git

merge of 6859af4fc51969fe6d5b6513f506486d9437a4cd
     and 7ac1989cc542e70bbfa30cce17ca52ca532dd19e
---

31d29bc3fc70189155f55351000b8447e03fcbd3