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

merge of 020407be67cb5ae7c9c858d86887a93ec7831f78
     and 76db664e471ff075c7d6410d2cae0e1bdc9b1178
---

9dd0bd811c1e340d8854b19e8f398244e7cc0523