From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Wed, 28 Jun 2006 23:02:09 +0000 (+0000)
Subject: merge of 2688bfa9b672d5b4d8734a288aa8b1e77ee47a60
X-Git-Tag: Release-2010-05/1~9453^2~1409
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e91a61ba8b5b1e3510c7ec1505ac71a3a0ce6b4;p=openembedded.git

merge of 2688bfa9b672d5b4d8734a288aa8b1e77ee47a60
     and 451e0728f5380a834da5ad8ecd79994cf6f12315
---

7e91a61ba8b5b1e3510c7ec1505ac71a3a0ce6b4