From: Cliff Brake <cbrake@bec-systems.com>
Date: Fri, 16 Jun 2006 18:04:26 +0000 (+0000)
Subject: merge of 68f7b61f8b07129863090b44593b3b470d146473
X-Git-Tag: Release-2010-05/1~9453^2~1454
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04794c35897f46d4df0c269c8f9df8475d9f2ba8;p=openembedded.git

merge of 68f7b61f8b07129863090b44593b3b470d146473
     and d8cfd65d1fa4c05f651452099660ba1d859412a9
---

04794c35897f46d4df0c269c8f9df8475d9f2ba8