From: Koen Kooi <koen@openembedded.org>
Date: Thu, 23 Feb 2006 13:02:23 +0000 (+0000)
Subject: merge of a9f324c20ac7e7ac1d2a2525d55b2e2894aac109
X-Git-Tag: Release-2010-05/1~9453^2~2304^2~68
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b5854143eda80a8828353fb4d95ec8491bd9413;p=openembedded.git

merge of a9f324c20ac7e7ac1d2a2525d55b2e2894aac109
     and c945bc8161c3df7b0862623cecfd4c6d3acb7be0
---

0b5854143eda80a8828353fb4d95ec8491bd9413