From: Cliff Brake <cbrake@bec-systems.com>
Date: Wed, 5 Jul 2006 16:46:46 +0000 (+0000)
Subject: merge of 384828c9ac96947ed787099eb14a15f49ebedcac
X-Git-Tag: Release-2010-05/1~9453^2~1332
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8520f8034086c6a1ecc08b17d038448a6fef7ae;p=openembedded.git

merge of 384828c9ac96947ed787099eb14a15f49ebedcac
     and b3afec9600880ee22a3041769633491d0f81c427
---

d8520f8034086c6a1ecc08b17d038448a6fef7ae