From: Frans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Date: Sat, 12 Aug 2006 16:40:34 +0000 (+0000)
Subject: merge of '41f08fea37c410bb9ff7093f2c2d35572c69171c'
X-Git-Tag: Release-2010-05/1~9453^2~968^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c6bf818df3770d5fbe1f10432339d6f841148c5;p=openembedded.git

Merge ... '41f08fea37c410bb9ff7093f2c2d35572c69171c'
     and 'b2242c9c486da6354ad533ce32c14a76e3ef9b69'
---

6c6bf818df3770d5fbe1f10432339d6f841148c5