From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 9 Sep 2006 15:31:24 +0000 (+0000)
Subject: merge of abdf62cfde72bff2a32973068f3d6880118a80e4
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=203af4b3f91a024b809bc81065f8c66ad6049246;p=openembedded.git

merge of abdf62cfde72bff2a32973068f3d6880118a80e4
     and c3e7e35d58cd4c43f5217b5ac306848515fd79e9
---

203af4b3f91a024b809bc81065f8c66ad6049246