From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 11 Dec 2006 16:04:10 +0000 (+0000)
Subject: merge of 64156492c5abe45f3de49419a3e7b50e836f2724
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~6^2^2~1^2^2^2^2~6^2~2^2~2^2~1^2~1^2~1^2^2^2^2^2~1^2^2^2^2^2~4^2~2^2~3^2^2~1^2~1^2^2~2^2~4^2^2^2~1^2~2^2~1^2~1^2^2~1^2^2^2^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4811267ed17876256f6dcef23d4a7bad4ec1419e;p=openembedded.git

merge of 64156492c5abe45f3de49419a3e7b50e836f2724
     and be66fa1ec63e7ff15377a6a8dcde064534caf6f5
---

4811267ed17876256f6dcef23d4a7bad4ec1419e