From: Justin Patrin <papercrane@gmail.com>
Date: Fri, 10 Feb 2006 04:48:23 +0000 (+0000)
Subject: merge of 3af6af596405ee2d8df8c79397157adaf28023b3
X-Git-Tag: Release-2010-05/1~9453^2~2371^2~39
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5475414a7806c4f9e82beb940caedfd60a1db74b;p=openembedded.git

merge of 3af6af596405ee2d8df8c79397157adaf28023b3
     and 96b18d585efe43c8bffa43523fa2b70496cc94fb
---

5475414a7806c4f9e82beb940caedfd60a1db74b