From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 10 Jul 2007 11:20:53 +0000 (+0000)
Subject: merge of '69c4f23827bd5d45cfcc6008cf24a3877da4126e'
X-Git-Tag: Release-2010-05/1~8868^2~170^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3615d96b98cb45c801b781b504aa3f9f33c04c26;p=openembedded.git

Merge ... '69c4f23827bd5d45cfcc6008cf24a3877da4126e'
     and '92f0750aade452d9021d2d2bd259d1b86edde5b5'
---

3615d96b98cb45c801b781b504aa3f9f33c04c26