From: Stelios Koroneos <skoroneos@digital-opsis.com>
Date: Thu, 1 May 2008 05:50:40 +0000 (+0000)
Subject: merge of '2a3b367f33ce37c133f19ffba687595aa7b1cbb4'
X-Git-Tag: Release-2010-05/1~7061^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=158d2f97769e0a22db98f1e39a6bd6fb7ccb627a;p=openembedded.git

Merge ... '2a3b367f33ce37c133f19ffba687595aa7b1cbb4'
     and '3828f582a9c1e77f2334c14bda8e79846078bfd3'
---

158d2f97769e0a22db98f1e39a6bd6fb7ccb627a