From: Koen Kooi <koen@openembedded.org>
Date: Sat, 4 Mar 2006 15:52:58 +0000 (+0000)
Subject: merge of 253db2cc1289b54dcf638e5bd3cd11ae2a9c432f
X-Git-Tag: Release-2010-05/1~9453^2~2295
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8251f5ecd1459bb5b25c622514324f133485986;p=openembedded.git

merge of 253db2cc1289b54dcf638e5bd3cd11ae2a9c432f
     and bee378ef0bf8d72ae3f2f94a19b1ed5b0b2f95f4
---

e8251f5ecd1459bb5b25c622514324f133485986