From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Mon, 20 Nov 2006 23:40:40 +0000 (+0000)
Subject: merge of 57c7ff1bca3e3d0423fe776b6cdf466b16f29e50
X-Git-Tag: Release-2010-05/1~9453^2~375^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3dcf083bbf111198f9aea74ef0230ecb1cd24d4;p=openembedded.git

merge of 57c7ff1bca3e3d0423fe776b6cdf466b16f29e50
     and d2393507d64bd7596d8c8cf859ad39de4bc4ed65
---

c3dcf083bbf111198f9aea74ef0230ecb1cd24d4