From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 10 Apr 2006 22:30:15 +0000 (+0000)
Subject: merge of 3392085b60cfb0f161a99c870ef6f89a6e93fdba
X-Git-Tag: Release-2010-05/1~9453^2~2045^2~2^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a6048ee45a7cca833c37b07c458f7fa0f28dd79;p=openembedded.git

merge of 3392085b60cfb0f161a99c870ef6f89a6e93fdba
     and 4c9177abc1e90522db01ceaed6de73ac1d5c0800
---

0a6048ee45a7cca833c37b07c458f7fa0f28dd79