From: Stelios Koroneos <skoroneos@digital-opsis.com>
Date: Sat, 29 Mar 2008 12:00:47 +0000 (+0000)
Subject: merge of '17cf14623c223d8cb74b50235967b61c1e9945f7'
X-Git-Tag: Release-2010-05/1~7256
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d377db4e5b7a6db87be5cd78cd4524d35156f791;p=openembedded.git

Merge ... '17cf14623c223d8cb74b50235967b61c1e9945f7'
     and '6ed033b5ebd18217b767c79c336455c89d8808cd'
---

d377db4e5b7a6db87be5cd78cd4524d35156f791