From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 11 Aug 2005 10:21:07 +0000 (+0000)
Subject: merge of 878c33f63dddf26432371b39e5ac632427adb9a9
X-Git-Tag: Release-2010-05/1~9453^2~3858^2~26^2~8
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fae33cac57d8a8cea05736cc47a9c2e19d679503;p=openembedded.git

merge of 878c33f63dddf26432371b39e5ac632427adb9a9
     and f27802cb19bc2b8066af4e34ef08a08acd4f6203
---

fae33cac57d8a8cea05736cc47a9c2e19d679503