From: Koen Kooi <koen@openembedded.org>
Date: Sat, 15 Apr 2006 21:52:32 +0000 (+0000)
Subject: merge of 4ed4d06c5ea603aeb65c4f23220d3a64c7e917c8
X-Git-Tag: Release-2010-05/1~9453^2~1907^2~120
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40bf9704a45c7ea1a34e2d698f76edebb8b40e5e;p=openembedded.git

merge of 4ed4d06c5ea603aeb65c4f23220d3a64c7e917c8
     and 8c18de8e683dcd5c02a273e3df84472d13182c02
---

40bf9704a45c7ea1a34e2d698f76edebb8b40e5e