From: Jamie Lenehan <lenehan@twibble.org>
Date: Mon, 3 Jul 2006 02:45:37 +0000 (+0000)
Subject: merge of 4fa66e8ed3c592fe36065306271c6b2c559b7b76
X-Git-Tag: Release-2010-05/1~9453^2~1366^2~6^2~2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d25e4d60596edd332dbfd2fc63c5e22899ac3600;p=openembedded.git

merge of 4fa66e8ed3c592fe36065306271c6b2c559b7b76
     and 7847e7c8b41faf980a8a08156c7c8a5bc616f814
---

d25e4d60596edd332dbfd2fc63c5e22899ac3600