From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Wed, 28 Jun 2006 22:57:45 +0000 (+0000)
Subject: merge of 60da1de31387d235b99e99c95290e2f845e6d0b0
X-Git-Tag: Release-2010-05/1~9453^2~1409^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ae098ac7348611935439c2ebc61c9165b046a9e;p=openembedded.git

merge of 60da1de31387d235b99e99c95290e2f845e6d0b0
     and e4bf98913631900c38f8f05d74d0f47a2a231a60
---

8ae098ac7348611935439c2ebc61c9165b046a9e