From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 26 Apr 2007 12:46:33 +0000 (+0000)
Subject: merge of '87b49518bcc5300a395daeb3510b7801f333eda9'
X-Git-Tag: Release-2010-05/1~8868^2~660^2~34^2~4^2~7
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5704436996d7e0ca4d058bc309f642d950f00956;p=openembedded.git

Merge ... '87b49518bcc5300a395daeb3510b7801f333eda9'
     and 'ba162bf6372784bad9177dc8a7fa8a66c9e665c4'
---

5704436996d7e0ca4d058bc309f642d950f00956