From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 24 Apr 2006 21:49:48 +0000 (+0000)
Subject: merge of 7134dba3d19d7e37fe8d91b2eb4472f07be7a583
X-Git-Tag: Release-2010-05/1~9453^2~1865
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24b92e71deb0c42ee148c8444aefe287b2ae4575;p=openembedded.git

merge of 7134dba3d19d7e37fe8d91b2eb4472f07be7a583
     and d8df52a582560aaab0778576a0d57ac53e65acdb
---

24b92e71deb0c42ee148c8444aefe287b2ae4575