From: Koen Kooi <koen@openembedded.org>
Date: Tue, 20 Dec 2005 11:59:01 +0000 (+0000)
Subject: merge of 1d8a85d29d23285494e2dc937981b14cd0907e19
X-Git-Tag: Release-2010-05/1~9453^2~2896
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c01a09f6a7c80d4794f9ad75b92032c4fda9fcc5;p=openembedded.git

merge of 1d8a85d29d23285494e2dc937981b14cd0907e19
     and e8e7132af4a76b95599213aafdc96c7e0f61582a
---

c01a09f6a7c80d4794f9ad75b92032c4fda9fcc5