From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 18 Feb 2008 23:17:33 +0000 (+0000)
Subject: merge of '6b3553faa17c40c389a2d9c4279cd0a6417358e7'
X-Git-Tag: Release-2010-05/1~7653^2~25^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=271bcb3e87c1c1b8236ccbc7d57f225fe60921b4;p=openembedded.git

Merge ... '6b3553faa17c40c389a2d9c4279cd0a6417358e7'
     and 'faf56bcfb610eaf73ff3c77e1c8c451cde82165d'
---

271bcb3e87c1c1b8236ccbc7d57f225fe60921b4