From: Justin Patrin <papercrane@gmail.com>
Date: Tue, 16 Aug 2005 22:04:52 +0000 (+0000)
Subject: merge of 089249369750f63e5367ef0ab91c190f50ae55e9
X-Git-Tag: Release-2010-05/1~9453^2~3895^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4980f85ed310bd9d9358e2c619447f468472bd3d;p=openembedded.git

merge of 089249369750f63e5367ef0ab91c190f50ae55e9
     and 093694eab501a28fcb36f83dedad796958b7a9ce
---

4980f85ed310bd9d9358e2c619447f468472bd3d