From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 26 Aug 2006 17:01:18 +0000 (+0000)
Subject: merge of 34964becdd90604942aa0cbe5287253c829dbfa3
X-Git-Tag: Release-2010-05/1~9453^2~837^2~1^2^2~1^2~3^2~1^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebbca0dd9039a62055745fa53cd4afa77b6a90e5;p=openembedded.git

merge of 34964becdd90604942aa0cbe5287253c829dbfa3
     and afab498efbb1b2ed67ef3d565b65517b1966d81d
---

ebbca0dd9039a62055745fa53cd4afa77b6a90e5