From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 2 Apr 2007 14:45:57 +0000 (+0000)
Subject: merge of '9b61539b8e105d428c07a9a551cc2bec487151bf'
X-Git-Tag: Release-2010-05/1~8868^2~852
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c5edc9271104e64791a411f848c109468f584fc;p=openembedded.git

Merge ... '9b61539b8e105d428c07a9a551cc2bec487151bf'
     and 'aff69a14340dd1655bfe774109fde80cc509eed6'
---

4c5edc9271104e64791a411f848c109468f584fc