From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 5 Sep 2006 19:46:22 +0000 (+0000)
Subject: merge of 20b7bbea275e7ecd24b4823a8ce94e3a8df944a9
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2~1^2^2~1^2^2^2~1^2^2~1^2^2^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f531b00978588b908d569abc4c977b69923e6b7c;p=openembedded.git

merge of 20b7bbea275e7ecd24b4823a8ce94e3a8df944a9
     and c2e09eb237e0886af84ee5fd3c3b201c4cec5550
---

f531b00978588b908d569abc4c977b69923e6b7c