From: Richard Purdie <rpurdie@rpsys.net>
Date: Wed, 5 Jul 2006 11:16:42 +0000 (+0000)
Subject: merge of 016c6244729b3a1e0b642424fa21373b86defa21
X-Git-Tag: Release-2010-05/1~9453^2~1339
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2c4229e534958f2e0ba69110e266c6c19b36591;p=openembedded.git

merge of 016c6244729b3a1e0b642424fa21373b86defa21
     and 1f2a8090a62969a13a937ea60ea66023fb6d48e2
---

d2c4229e534958f2e0ba69110e266c6c19b36591