From: Cliff Brake <cbrake@bec-systems.com>
Date: Wed, 31 Aug 2005 14:19:51 +0000 (+0000)
Subject: merge of 4e126c4523e768ce808bbed9a1c49d7855904efb
X-Git-Tag: Release-2010-05/1~9453^2~3732
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cb8d856cd0f4294ff349362994f9a784982c36c;p=openembedded.git

merge of 4e126c4523e768ce808bbed9a1c49d7855904efb
     and 9178fa6f2933e92a1fb27a64d0e1fa7b48fc6ba2
---

1cb8d856cd0f4294ff349362994f9a784982c36c