From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 26 Jun 2007 08:14:09 +0000 (+0000)
Subject: merge of '7d911a2d488420f755862dde3e5c82e43913c991'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98d70019b763b048fdd371382aae1dfa4d57cc42;p=openembedded.git

Merge ... '7d911a2d488420f755862dde3e5c82e43913c991'
     and '999d34f6a16eb76013607894a0608c627e0279a1'
---

98d70019b763b048fdd371382aae1dfa4d57cc42