From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 22 Aug 2006 08:57:18 +0000 (+0000)
Subject: merge of '1f2f012d4e3072be1a917b5e7a8798d0990b2134'
X-Git-Tag: Release-2010-05/1~9453^2~911^2~26^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbb28e1fb0793ae2647060b09e353d322693e12d;p=openembedded.git

Merge ... '1f2f012d4e3072be1a917b5e7a8798d0990b2134'
     and '8d5edb15fd62844024c79d94ed5d6b8da85d0d36'
---

fbb28e1fb0793ae2647060b09e353d322693e12d