From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Sun, 3 Jul 2005 15:49:26 +0000 (+0000)
Subject: merge of 5d0bf12db458113fa06f91798e1362090e49ba8f
X-Git-Tag: Release-2010-05/1~9453^2~4252^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70b04cd4873a7bd9604e1ead52809b3ce88092ca;p=openembedded.git

merge of 5d0bf12db458113fa06f91798e1362090e49ba8f
     and 88adaace5b8cfe88c5164b75dc29d943a114c8f5
---

70b04cd4873a7bd9604e1ead52809b3ce88092ca