From: Koen Kooi <koen@openembedded.org>
Date: Wed, 26 Mar 2008 18:46:06 +0000 (+0000)
Subject: merge of '1ba445dfd1a9b934962a4db388d6ab641b3f74e8'
X-Git-Tag: Release-2010-05/1~7275
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48fd147498115e7682153b9ec28f4ab0065a845e;p=openembedded.git

Merge ... '1ba445dfd1a9b934962a4db388d6ab641b3f74e8'
     and '8f2da0702f522e178a88e3c2dd8f65e05d0680a7'
---

48fd147498115e7682153b9ec28f4ab0065a845e