From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 24 Oct 2007 11:40:11 +0000 (+0000)
Subject: merge of '4447992dd58cf24ab0fb99dba811074b21c6aa2e'
X-Git-Tag: Release-2010-05/1~8454^2~154^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96839cb854eda459f0f6d05bc87a10e45856c17a;p=openembedded.git

Merge ... '4447992dd58cf24ab0fb99dba811074b21c6aa2e'
     and '978814b6112fa21afb021154c869d766d3db1175'
---

96839cb854eda459f0f6d05bc87a10e45856c17a