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

merge of 975b96916690358f4a6cab8fbb7308fce112d311
     and b97ad46b88a01ddecefed222491f15a9b1ba45c9
---

314731d7c422279c41de7b7c1921497226237498