From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sat, 6 Jan 2007 16:40:10 +0000 (+0000)
Subject: merge of 'e7b51cdff552f8acee23869051f6d9ddf9b5cb85'
X-Git-Tag: Release-2010-05/1~9447^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9b60feae19bd118ed949fe37a4cbc43a7db33cd;p=openembedded.git

Merge ... 'e7b51cdff552f8acee23869051f6d9ddf9b5cb85'
     and 'ff4945554f42e9be0ee0cf9d1a222718ac61d4b6'
---

d9b60feae19bd118ed949fe37a4cbc43a7db33cd