From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 24 Aug 2005 02:28:08 +0000 (+0000)
Subject: merge of b7caf8f6d4169c1c8831f9278bfd58e9e26f1f16
X-Git-Tag: Release-2010-05/1~9453^2~3780
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6db9af183ca80355de788a848b58d8ef734ca5f6;p=openembedded.git

merge of b7caf8f6d4169c1c8831f9278bfd58e9e26f1f16
     and e783539488fcda20e1c43df96f5922c3a22d7839
---

6db9af183ca80355de788a848b58d8ef734ca5f6