From: Ovidiu Sas <sip.nslu@gmail.com>
Date: Wed, 16 Jan 2008 15:29:38 +0000 (+0000)
Subject: merge of '16c96161b634d2e64b9a1b4ba0e3fff5ddf21bcb'
X-Git-Tag: Release-2010-05/1~7890^2~7^2~3^2~1^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edfc1860782c39f6507cf68bc63620bf9e0f18f8;p=openembedded.git

Merge ... '16c96161b634d2e64b9a1b4ba0e3fff5ddf21bcb'
     and 'c32d254617ffcc037ac8e1b813c7d23979d2cb1c'
---

edfc1860782c39f6507cf68bc63620bf9e0f18f8