From: Philip Balister <philip@balister.org>
Date: Fri, 8 Aug 2008 22:01:58 +0000 (+0000)
Subject: merge of '05dd48c35e7fc8bd8ec725a975682953f4e2eb8b'
X-Git-Tag: Release-2010-05/1~6333^2~45^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9938336c173acad89726fa60605abba7c23d57f;p=openembedded.git

Merge ... '05dd48c35e7fc8bd8ec725a975682953f4e2eb8b'
     and 'e5d51ef06db323f64e81b4277041a3eb479eda1b'
---

e9938336c173acad89726fa60605abba7c23d57f