From: Richard Purdie <rpurdie@rpsys.net>
Date: Tue, 19 Feb 2008 00:56:06 +0000 (+0000)
Subject: merge of '694c143930f178ea5ccba7d4b239f54693907dfd'
X-Git-Tag: Release-2010-05/1~7653^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4761a32f393e6758e4f088e0e575bcdeb7662723;p=openembedded.git

Merge ... '694c143930f178ea5ccba7d4b239f54693907dfd'
     and '9a5c15be9874f0b2b7306eef34bbc113197516e3'
---

4761a32f393e6758e4f088e0e575bcdeb7662723