From: Richard Purdie <rpurdie@rpsys.net>
Date: Fri, 13 Jan 2006 01:06:31 +0000 (+0000)
Subject: merge of 47b2cb70582f02182c20ba10e58134187a72bcd3
X-Git-Tag: Release-2010-05/1~9453^2~2672^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac959b195dc30d5e6912d11f07f727d03569ddde;p=openembedded.git

merge of 47b2cb70582f02182c20ba10e58134187a72bcd3
     and f1adf0c8840c57a416d7da7085aa694f11be4c5c
---

ac959b195dc30d5e6912d11f07f727d03569ddde