From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Wed, 5 Jul 2006 16:18:51 +0000 (+0000)
Subject: merge of 8c16cdbfd0fc7d55498a7ffc0a2e64b24025460d
X-Git-Tag: Release-2010-05/1~9453^2~1332^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97e1d6538b1f7396b13ac9cd14fb8092b26fb712;p=openembedded.git

merge of 8c16cdbfd0fc7d55498a7ffc0a2e64b24025460d
     and f1c9afde058f9dacdf29b67d8609495aef4205f5
---

97e1d6538b1f7396b13ac9cd14fb8092b26fb712