From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 17 Aug 2006 11:46:16 +0000 (+0000)
Subject: merge of a37386c647ba514be2ca59ef5c79c6a6a410c1ac
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2^2^2~2^2^2~5^2^2~4^2^2~2^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0afc55cfe70a7ba152618b60e1eb2958dedcf58d;p=openembedded.git

merge of a37386c647ba514be2ca59ef5c79c6a6a410c1ac
     and f876e12a0a86569a88b52f784afdf938aae16b25
---

0afc55cfe70a7ba152618b60e1eb2958dedcf58d