From: Justin Patrin <papercrane@gmail.com>
Date: Sun, 7 May 2006 04:13:42 +0000 (+0000)
Subject: merge of 776e1905d2f3baf38c1533b632b4f01946bfc375
X-Git-Tag: Release-2010-05/1~9453^2~1765
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc2b2ca15b279f5dfe997ff8cc6cd078f565a51e;p=openembedded.git

merge of 776e1905d2f3baf38c1533b632b4f01946bfc375
     and f139a1f31b4ee39ad2590b0acb8dcf142c1e8d72
---

fc2b2ca15b279f5dfe997ff8cc6cd078f565a51e