From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 14 Jan 2006 05:51:47 +0000 (+0000)
Subject: merge of 05f59d0250f45dd58a55c7c2c2889b58d28951ef
X-Git-Tag: Release-2010-05/1~9453^2~2608^2~6^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42985047a476cf2ba4e4a27cdc5a4f7ee2756e19;p=openembedded.git

merge of 05f59d0250f45dd58a55c7c2c2889b58d28951ef
     and 46041f133cbc74bb45da74974398099f4df06233
---

42985047a476cf2ba4e4a27cdc5a4f7ee2756e19