From: Derek Young <dyoung@nslu2-linux.org>
Date: Sun, 2 Mar 2008 21:50:50 +0000 (+0000)
Subject: merge of '0c093b26a4dcd73c59fdfd549e99d4e4d6ce6ff7'
X-Git-Tag: Release-2010-05/1~7572^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcbe730f843f8fb2dda8e9064605c104b0b92144;p=openembedded.git

Merge ... '0c093b26a4dcd73c59fdfd549e99d4e4d6ce6ff7'
     and 'ad750d608664d7708c21300ab3eed2feec262c22'
---

bcbe730f843f8fb2dda8e9064605c104b0b92144