From: David Karlstrom <daka@thg.se>
Date: Sun, 21 Aug 2005 08:14:51 +0000 (+0000)
Subject: merge of 7e5aec0634897d3c7afdf3aebe3c28008e54239b
X-Git-Tag: Release-2010-05/1~9453^2~3849^2~5^2~1^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19235c78897e5219f04180412e5ab6fe2f22e30d;p=openembedded.git

merge of 7e5aec0634897d3c7afdf3aebe3c28008e54239b
     and 8ba34c2a2418ae3ae68c35cd0c6a9b535ec1178b
---

19235c78897e5219f04180412e5ab6fe2f22e30d