From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 13 Mar 2007 23:55:05 +0000 (+0000)
Subject: merge of '3950a81865cd632074398265aeb1cff64bfd56c1'
X-Git-Tag: Release-2010-05/1~8868^2~1092^2~1^2~7^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27a692df874f523087e24cf4e2b150f9c04a688f;p=openembedded.git

Merge ... '3950a81865cd632074398265aeb1cff64bfd56c1'
     and 'b7e38ccba43c893e20bc2db30dfbdd9a3f6c2053'
---

27a692df874f523087e24cf4e2b150f9c04a688f