From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 30 Apr 2006 13:03:25 +0000 (+0000)
Subject: merge of 48e22a27d72e0291a7522958cfc2305284cb8d98
X-Git-Tag: Release-2010-05/1~9453^2~1787^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c15557bd9f35bc698b01ea8029c62594b42d57f3;p=openembedded.git

merge of 48e22a27d72e0291a7522958cfc2305284cb8d98
     and 6b52726b2e4761c9b7b4858f6bdbc723e606359a
---

c15557bd9f35bc698b01ea8029c62594b42d57f3