From: Richard Purdie <rpurdie@rpsys.net>
Date: Wed, 3 Aug 2005 08:25:37 +0000 (+0000)
Subject: merge of 26c7aa9a5e1ee433e5f5ee59307c1840d2e0658e
X-Git-Tag: Release-2010-05/1~9453^2~3994^2~27^2~1^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b67dff65efdea9f5c2ac5ece9e312de3d4480276;p=openembedded.git

merge of 26c7aa9a5e1ee433e5f5ee59307c1840d2e0658e
     and ef346e4f39975933d42031cb6e4b7d2b9656e9e7
---

b67dff65efdea9f5c2ac5ece9e312de3d4480276