From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 15 Apr 2007 13:01:30 +0000 (+0000)
Subject: merge of '4fa4f87979de4219c88fba63ac6ae11b020aeced'
X-Git-Tag: Release-2010-05/1~8868^2~689^2~14
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcff371f805e713fee07d4882895a0ce3079fe45;p=openembedded.git

Merge ... '4fa4f87979de4219c88fba63ac6ae11b020aeced'
     and '9f6fbbb5245b3e296c86950b2208386df7b36ffc'
---

fcff371f805e713fee07d4882895a0ce3079fe45