From: Cliff Brake <cbrake@bec-systems.com>
Date: Tue, 6 Jun 2006 12:25:16 +0000 (+0000)
Subject: merge of 0b8c4181555b825cbd5881514e7b734305e69368
X-Git-Tag: Release-2010-05/1~9453^2~1494^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b9cae90ec69fd147bf189ee778c19a5313a2c45;p=openembedded.git

merge of 0b8c4181555b825cbd5881514e7b734305e69368
     and 0d0dcc009c37fcecc54e97eba35a6168bb1b18a4
---

5b9cae90ec69fd147bf189ee778c19a5313a2c45