From: Justin Patrin <papercrane@gmail.com>
Date: Wed, 8 Feb 2006 21:12:54 +0000 (+0000)
Subject: merge of 72da6517a613608cf82abf0dfaac25e03fbf478b
X-Git-Tag: Release-2010-05/1~9453^2~2387^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcbbfc041e59a98c9d88f4972230c4610af7a96b;p=openembedded.git

merge of 72da6517a613608cf82abf0dfaac25e03fbf478b
     and 81310a82efd8fa4b4ce7bd707ed734f3ce153c46
---

dcbbfc041e59a98c9d88f4972230c4610af7a96b