From: Frans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Date: Fri, 4 Aug 2006 15:23:17 +0000 (+0000)
Subject: merge of '233bbfa6009ef8bfd4c0cf83a114892b0f99fc16'
X-Git-Tag: Release-2010-05/1~9453^2~999^2~20^2~27^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=806d812114619254093f3de44f3675e036f93101;p=openembedded.git

Merge ... '233bbfa6009ef8bfd4c0cf83a114892b0f99fc16'
     and '3491d9f296a401cc5eedae873334c80e480f7901'
---

806d812114619254093f3de44f3675e036f93101