From: Koen Kooi <koen@openembedded.org>
Date: Mon, 13 Feb 2006 22:06:00 +0000 (+0000)
Subject: merge of 0a90fa3f8e7b85f79fe8930a1969aff12f3553b8
X-Git-Tag: Release-2010-05/1~9453^2~2371
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96911bb2416b57ccd0d01dedadbd95c45fba9f44;p=openembedded.git

merge of 0a90fa3f8e7b85f79fe8930a1969aff12f3553b8
     and f207b08f6d852f81f78ab6a6c3ed4502fc88f898
---

96911bb2416b57ccd0d01dedadbd95c45fba9f44