From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 21 Nov 2005 20:10:55 +0000 (+0000)
Subject: merge of 158afdd838b31df26f6951d343eb64d7a3eb3909
X-Git-Tag: Release-2010-05/1~9453^2~3036^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a5d10b1dd4f6c36fe5a6f191b60adc4c1b549c0;p=openembedded.git

merge of 158afdd838b31df26f6951d343eb64d7a3eb3909
     and 3cdaadf3573042323abd430b463d5b128034e0e1
---

0a5d10b1dd4f6c36fe5a6f191b60adc4c1b549c0