From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Fri, 11 Aug 2006 16:24:06 +0000 (+0000)
Subject: merge of bddbb157960dc74708ee1f412dc226c4e119322f
X-Git-Tag: Release-2010-05/1~9453^2~972^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebd2f8f3a6a7bd90649b75a4e54ff87d9dd6f2a1;p=openembedded.git

merge of bddbb157960dc74708ee1f412dc226c4e119322f
     and d6d342eb596dfa4dccbd85b8270c275e8e076491
---

ebd2f8f3a6a7bd90649b75a4e54ff87d9dd6f2a1