From: Philip Balister <philip@balister.org>
Date: Wed, 20 Aug 2008 02:13:28 +0000 (+0000)
Subject: merge of '1d51291e2946f8f88897f24b6db6c2e9f0c5bcec'
X-Git-Tag: Release-2010-05/1~6305^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e42584299a8db7c9aae185d543a123ecf511ecba;p=openembedded.git

Merge ... '1d51291e2946f8f88897f24b6db6c2e9f0c5bcec'
     and 'cc2c069fffc980b5b6a0eb9cddd44f04d367dd25'
---

e42584299a8db7c9aae185d543a123ecf511ecba