From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 8 Dec 2005 07:38:29 +0000 (+0000)
Subject: merge of 94d7300df891d316206c5d2638f48b33f130cdf6
X-Git-Tag: Release-2010-05/1~9453^2~2967
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17674905105bf2bced88e9ce641a09dd199109b3;p=openembedded.git

merge of 94d7300df891d316206c5d2638f48b33f130cdf6
     and b12a6f317d2686fea2fdf958f105aefd8de77146
---

17674905105bf2bced88e9ce641a09dd199109b3