From: Koen Kooi <koen@openembedded.org>
Date: Sat, 4 Feb 2006 17:09:10 +0000 (+0000)
Subject: merge of b0041ee48a666506c812a40e9060b22a24c30129
X-Git-Tag: Release-2010-05/1~9453^2~2458^2~5^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c4ff296d21b93696c7279f3e8003b42b6b5d0be;p=openembedded.git

merge of b0041ee48a666506c812a40e9060b22a24c30129
     and b0704e33e45a8227abcb70a1857484bbc2f749e5
---

7c4ff296d21b93696c7279f3e8003b42b6b5d0be