From: Stelios Koroneos <skoroneos@digital-opsis.com>
Date: Thu, 7 Jun 2007 23:22:05 +0000 (+0000)
Subject: merge of '6f561d859809d8ecf2f630fa156e48ff01eec95e'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~57
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dc1d8f47557e31626882a601280bae686507ded;p=openembedded.git

Merge ... '6f561d859809d8ecf2f630fa156e48ff01eec95e'
     and 'dc47960ed2e4a7c23345df36c3ffb76c1cf5df71'
---

5dc1d8f47557e31626882a601280bae686507ded