From: Richard Purdie <rpurdie@rpsys.net>
Date: Fri, 29 Feb 2008 16:13:29 +0000 (+0000)
Subject: merge of '6d9979f4d29d1dff2350a558f25813ce7f2c8c9e'
X-Git-Tag: Release-2010-05/1~7572^2~25^2~7^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=339144112d488d42d84fe5e1d91ba20bde769f76;p=openembedded.git

Merge ... '6d9979f4d29d1dff2350a558f25813ce7f2c8c9e'
     and '9d51ade6b4318612931d9e49436a802f6c1fa43f'
---

339144112d488d42d84fe5e1d91ba20bde769f76