From: Matt Reimer <mattjreimer@gmail.com>
Date: Tue, 6 Feb 2007 18:48:59 +0000 (+0000)
Subject: merge of '74301428ab37e923090b24e6a2336ca84af564f2'
X-Git-Tag: Release-2010-05/1~8868^2~1032^2~3^2^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f3a0dab967a0f1a2d8ad2693a7c60436ddf230a;p=openembedded.git

Merge ... '74301428ab37e923090b24e6a2336ca84af564f2'
     and 'b9a2e7516cc3620c51495eadf5a2d938086881a9'
---

0f3a0dab967a0f1a2d8ad2693a7c60436ddf230a