From: Stelios Koroneos <skoroneos@digital-opsis.com>
Date: Mon, 5 May 2008 10:40:17 +0000 (+0000)
Subject: merge of '2c62d5f53df6ab7b1ada734c156e6c252c1ef900'
X-Git-Tag: Release-2010-05/1~7019^2~3^2^2~8^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e04b6ca486e716a1278dd573069a587ddeef9056;p=openembedded.git

Merge ... '2c62d5f53df6ab7b1ada734c156e6c252c1ef900'
     and '996e4e3c8e89056619f693368ad07d4870016cd6'
---

e04b6ca486e716a1278dd573069a587ddeef9056