From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Wed, 2 Aug 2006 15:04:18 +0000 (+0000)
Subject: merge of b4d676ca1731d058a9e6796e021b076ade646392
X-Git-Tag: Release-2010-05/1~9453^2~999^2~24^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0914be150cc8591bf57bc410eca5beb6aa792b4e;p=openembedded.git

merge of b4d676ca1731d058a9e6796e021b076ade646392
     and e721389595223c9f6bdea1c71cffa6a144b92e72
---

0914be150cc8591bf57bc410eca5beb6aa792b4e