From: Koen Kooi <koen@openembedded.org>
Date: Tue, 5 Sep 2006 17:21:52 +0000 (+0000)
Subject: merge of '4e7386151d1273724db821c550dbd7106a83f5ab'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~47^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a71eb21d42440fe7231f01b56bdd3f99969bfb1;p=openembedded.git

Merge ... '4e7386151d1273724db821c550dbd7106a83f5ab'
     and 'cf8c1ed406de001e5360194fb99e473ec381a3a0'
---

5a71eb21d42440fe7231f01b56bdd3f99969bfb1