From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 4 Jan 2007 11:24:40 +0000 (+0000)
Subject: merge of '4876e130f4dda342390929a72c2c452dfa33d3ac'
X-Git-Tag: Release-2010-05/1~9453^2~27^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cbe26dd9647243ade652ef1a7a6fbb2402c6576;p=openembedded.git

Merge ... '4876e130f4dda342390929a72c2c452dfa33d3ac'
     and 'e0d9912acaac13bd724188fe1ad13ef35363ee75'
---

7cbe26dd9647243ade652ef1a7a6fbb2402c6576