From: Ovidiu Sas <sip.nslu@gmail.com>
Date: Sat, 2 Feb 2008 02:05:40 +0000 (+0000)
Subject: merge of '8bc0e0a5967ae8fccb6d56b0d9f5a3a9bf3d7dff'
X-Git-Tag: Release-2010-05/1~7765^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c63e9d13cb35a08fe503e53883f75460eacbd040;p=openembedded.git

Merge ... '8bc0e0a5967ae8fccb6d56b0d9f5a3a9bf3d7dff'
     and 'edd46f6b477e2a693c84c2ba999b868f23a733f0'
---

c63e9d13cb35a08fe503e53883f75460eacbd040