From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 18 Dec 2006 23:02:17 +0000 (+0000)
Subject: merge of 9bf3ff8cbc2ee634d3a1dffaf7391970cd26f779
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f45ff24f7bff89b5c64a4b7bebdd9ee990814f81;p=openembedded.git

merge of 9bf3ff8cbc2ee634d3a1dffaf7391970cd26f779
     and f499733e6db527846e1a48cf70f9862d6b3798ae
---

f45ff24f7bff89b5c64a4b7bebdd9ee990814f81