From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Sat, 19 Aug 2006 18:41:04 +0000 (+0000)
Subject: merge of 336c2756d6daa832106c29d9ab7c874fcd6815d7
X-Git-Tag: Release-2010-05/1~9453^2~911^2~16^2~3^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a57f0313a005214a34677c35bcb8bc318dea79d;p=openembedded.git

merge of 336c2756d6daa832106c29d9ab7c874fcd6815d7
     and cb591f5b883733fa2368b93267c8b93a727fa2c7
---

5a57f0313a005214a34677c35bcb8bc318dea79d