From: Justin Patrin <papercrane@gmail.com>
Date: Mon, 13 Feb 2006 02:38:48 +0000 (+0000)
Subject: merge of 224679d0d1adfe1e36b72ea199644249ab797df3
X-Git-Tag: Release-2010-05/1~9453^2~2371^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1efdb3e863ab02bbda3e1dcb3ee8ecb308a0da5d;p=openembedded.git

merge of 224679d0d1adfe1e36b72ea199644249ab797df3
     and b8bb8279a60f23addb3b8d68e1bdc2549d5c7f12
---

1efdb3e863ab02bbda3e1dcb3ee8ecb308a0da5d