From: Philippe De Swert <philippedeswert@scarlet.be>
Date: Wed, 4 Apr 2007 18:48:50 +0000 (+0000)
Subject: merge of 'cd87faafb1baaea21105f7e6c92532f906050469'
X-Git-Tag: Release-2010-05/1~8868^2~780^2~8^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7f9843c498125c0c1235ff3ff9039860e03ef02;p=openembedded.git

Merge ... 'cd87faafb1baaea21105f7e6c92532f906050469'
     and 'ea691c5d58c6ea052d5fb36c169cfbedfea096b3'
---

f7f9843c498125c0c1235ff3ff9039860e03ef02