From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 2 Sep 2006 12:16:41 +0000 (+0000)
Subject: merge of 4ce409402d3a4d6242c33a93272d0721659ad13f
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d926125c1a5625158b9289ef65823a9e27c96b57;p=openembedded.git

merge of 4ce409402d3a4d6242c33a93272d0721659ad13f
     and 747b2ae41837a134b43a3e9bb9c7a46057822d65
---

d926125c1a5625158b9289ef65823a9e27c96b57