From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 18 Oct 2007 10:23:12 +0000 (+0000)
Subject: merge of '6a20ffdd5a12f195a2bbd1c8cdb586851f2c7ba4'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=636a4c11a1e6c776555b0b98e1fcad8e5af93afd;p=openembedded.git

Merge ... '6a20ffdd5a12f195a2bbd1c8cdb586851f2c7ba4'
     and 'b5ad5b3bb47b5542ba4265b827bf2fee6dc5e18a'
---

636a4c11a1e6c776555b0b98e1fcad8e5af93afd