From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 26 Apr 2006 16:37:40 +0000 (+0000)
Subject: merge of 030151d3784053d0f38b8d3ce7c867b65b9de8be
X-Git-Tag: Release-2010-05/1~9453^2~1787^2~7^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0f36157c7da268d0e779866e80d3c7278e0d29e;p=openembedded.git

merge of 030151d3784053d0f38b8d3ce7c867b65b9de8be
     and b97fadfd2eab8eb429ad031bc7e591cf3cddc31a
---

a0f36157c7da268d0e779866e80d3c7278e0d29e