From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 29 Mar 2007 13:10:58 +0000 (+0000)
Subject: merge of '33a1439ed0925b6fdb7b29081cfb7c2481aebdd3'
X-Git-Tag: Release-2010-05/1~8868^2~928
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=136fd5b056088e2f71e2baf9b17a623575e856e8;p=openembedded.git

Merge ... '33a1439ed0925b6fdb7b29081cfb7c2481aebdd3'
     and 'c3806da7db88d5cd14b6cc7ed62c575f1269f6d4'
---

136fd5b056088e2f71e2baf9b17a623575e856e8