From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 12 Sep 2006 09:25:38 +0000 (+0000)
Subject: merge of '14cc680dbaa6317eec602330d2fe0ac7dea3be7a'
X-Git-Tag: Release-2010-05/1~9453^2~837^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30136a8e89b86b9e3d0fa4b07fafdf484ff8d4f2;p=openembedded.git

Merge ... '14cc680dbaa6317eec602330d2fe0ac7dea3be7a'
     and '350557edbea2aa55107ce4c0e4dffc849b7e2307'
---

30136a8e89b86b9e3d0fa4b07fafdf484ff8d4f2