From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 20 Jul 2005 21:08:16 +0000 (+0000)
Subject: merge of 145ec84e58e7acefd29711cc2431b9809b8804e9
X-Git-Tag: Release-2010-05/1~9453^2~4093
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8aba67c458151eb8e611c7548029774be457a3cc;p=openembedded.git

merge of 145ec84e58e7acefd29711cc2431b9809b8804e9
     and 35b8f55d1b410a1bfaf9a685272c65e43f330691
---

8aba67c458151eb8e611c7548029774be457a3cc