From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 28 Aug 2006 00:01:42 +0000 (+0000)
Subject: merge of 1e0480e593c593d843d47a6544316b0a4962aabc
X-Git-Tag: Release-2010-05/1~9453^2~837^2~1^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=431b0378e7c2a282c4dc5ba2bf641d644facc4dd;p=openembedded.git

merge of 1e0480e593c593d843d47a6544316b0a4962aabc
     and dc88ee4bff5f0f182c0b1d470ba265c9fb1e24fd
---

431b0378e7c2a282c4dc5ba2bf641d644facc4dd