From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 4 Feb 2006 16:24:40 +0000 (+0000)
Subject: merge of 606273dce3a98e6ee0f49b8f1b1fd6e0c7589de4
X-Git-Tag: Release-2010-05/1~9453^2~2458^2~5^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92324d6f005511e66b8cfed48b65e1efd46c2c6a;p=openembedded.git

merge of 606273dce3a98e6ee0f49b8f1b1fd6e0c7589de4
     and c9a508bd5e793702701e7c831135d1881474b0fa
---

92324d6f005511e66b8cfed48b65e1efd46c2c6a