From: Koen Kooi <koen@openembedded.org>
Date: Sun, 23 Apr 2006 15:31:24 +0000 (+0000)
Subject: merge of 55616adc37fd37aa5b75ff09493523a3f11eb2e9
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~30^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43a499b782367210547e21c1f3e8aabdbcd2d29c;p=openembedded.git

merge of 55616adc37fd37aa5b75ff09493523a3f11eb2e9
     and a9dcf266b1c5bcea869b5f63ef5e8b7a2739b0f2
---

43a499b782367210547e21c1f3e8aabdbcd2d29c