From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 17 Apr 2008 13:14:46 +0000 (+0000)
Subject: merge of '4f55fef36523ba6ae829feec111a2bcd0e9e7088'
X-Git-Tag: Release-2010-05/1~7177
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bfc761321a85432d15828fa3c44632b0bd2cb9a;p=openembedded.git

Merge ... '4f55fef36523ba6ae829feec111a2bcd0e9e7088'
     and 'b96f9f2ce38832413116be9151b3f4213200e5ff'
---

4bfc761321a85432d15828fa3c44632b0bd2cb9a