From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Tue, 8 Aug 2006 16:29:49 +0000 (+0000)
Subject: merge of 06626817d6e4c48c4f1832c0f65a5736087ed3df
X-Git-Tag: Release-2010-05/1~9453^2~996^2~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25ba1e57507f5a0b8b8163551aab626d80f16b6e;p=openembedded.git

merge of 06626817d6e4c48c4f1832c0f65a5736087ed3df
     and af0f25bad53ac40966623922f300d0010d5bddcd
---

25ba1e57507f5a0b8b8163551aab626d80f16b6e