From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 8 Sep 2006 12:16:26 +0000 (+0000)
Subject: merge of 350557edbea2aa55107ce4c0e4dffc849b7e2307
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c7472f0a6d6b120c1af88cacdc3b3835a2400e1;p=openembedded.git

merge of 350557edbea2aa55107ce4c0e4dffc849b7e2307
     and 8dc3bf0f0946de0d1d527f793b59dfac8bf363bb
---

4c7472f0a6d6b120c1af88cacdc3b3835a2400e1