From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 9 Feb 2006 01:17:15 +0000 (+0000)
Subject: merge of cb029ed3000d87d044985d267579aec44a4ca644
X-Git-Tag: Release-2010-05/1~9453^2~2382^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1299a1bf54ef7655416db297e9b414ad625e8d99;p=openembedded.git

merge of cb029ed3000d87d044985d267579aec44a4ca644
     and e397c9dbfc8889c38742886d0a402a957ddee229
---

1299a1bf54ef7655416db297e9b414ad625e8d99