From: Philip Balister <philip@balister.org>
Date: Tue, 2 Oct 2007 20:18:56 +0000 (+0000)
Subject: merge of '86c3bb401cff2bd54526bee645900700122e1549'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~128^2~11^2~20^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=210c31014452abd6184b45896449c3458f79e7a1;p=openembedded.git

Merge ... '86c3bb401cff2bd54526bee645900700122e1549'
     and 'cd2d09bd89f1169ae4ec847af474c0e14580178d'
---

210c31014452abd6184b45896449c3458f79e7a1