From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 7 Jul 2007 13:28:55 +0000 (+0000)
Subject: merge of 'b25bbba02ddb4b23e57f722647bea8974b902b1e'
X-Git-Tag: Release-2010-05/1~8868^2~189^2~3^2~26^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0b801dc33f8f674aa6d3b2904dfb1f5b5b6d073;p=openembedded.git

Merge ... 'b25bbba02ddb4b23e57f722647bea8974b902b1e'
     and 'c2b7bf2b98443cd961a60ce5dd26e8d6e01afda2'
---

f0b801dc33f8f674aa6d3b2904dfb1f5b5b6d073