From: Koen Kooi <koen@openembedded.org>
Date: Sun, 8 Jan 2006 00:35:22 +0000 (+0000)
Subject: merge of 47dce11edfa131d098408e653487b0f793394e95
X-Git-Tag: Release-2010-05/1~9453^2~2707^2^2~11^2^2~8^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa659825f852872c0c91724212607fb9c519cb30;p=openembedded.git

merge of 47dce11edfa131d098408e653487b0f793394e95
     and 61486dc9a1b23e7088c746a1a9d6c6199cc8f5a5
---

aa659825f852872c0c91724212607fb9c519cb30