From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 8 Jun 2007 00:51:10 +0000 (+0000)
Subject: merge of '26c11eced35769b1c0bbf0d0f40726505128a158'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~5^2^2^2~1^2~2^2^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac3162bab2a58e1102f20025e7c57cdabbc596bc;p=openembedded.git

Merge ... '26c11eced35769b1c0bbf0d0f40726505128a158'
     and '98d522eb453e1ea4e6d6f1d2211611fd8157688c'
---

ac3162bab2a58e1102f20025e7c57cdabbc596bc