From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 29 Aug 2006 16:31:17 +0000 (+0000)
Subject: merge of 44124abd48f27837e13fa3f3c4fe61b086c0c08f
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~5^2~1^2^2~1^2^2~2^2~1^2^2^2^2~1^2~2^2^2~1^2^2^2^2~1^2~2^2^2~1^2^2~3^2^2~2^2~2^2~1^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09c43196e2a581f29baa63225cfdd83a4993e097;p=openembedded.git

merge of 44124abd48f27837e13fa3f3c4fe61b086c0c08f
     and e5114fb47d9e76254a369622a1dfe36c0e36d389
---

09c43196e2a581f29baa63225cfdd83a4993e097