From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 23 Aug 2006 11:15:20 +0000 (+0000)
Subject: merge of '5c6bd9229c2912167e04e747499aa015e936f86e'
X-Git-Tag: Release-2010-05/1~9453^2~911^2~10^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d67a8ee9a19dc01ad9ac3a3cc3dd756d31a42696;p=openembedded.git

Merge ... '5c6bd9229c2912167e04e747499aa015e936f86e'
     and '99d4c960758f8db7a224500ef5d1acd1663ceec0'
---

d67a8ee9a19dc01ad9ac3a3cc3dd756d31a42696