From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 30 Mar 2007 16:50:13 +0000 (+0000)
Subject: merge of '6396af305b4f951d7d88215419603669286e4715'
X-Git-Tag: Release-2010-05/1~8868^2~875^2~10
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50624effaa62e115c47910070b6a2bf41a7c13ea;p=openembedded.git

Merge ... '6396af305b4f951d7d88215419603669286e4715'
     and 'ec901188db91713e17379558a1160d8fa110f22c'
---

50624effaa62e115c47910070b6a2bf41a7c13ea